[Checkins] SVN: z3c.securitytool/trunk/src/z3c/securitytool/ Restructured configuration files to reduce repetition

Daniel Blackburn blackburnd at gmail.com
Sat Feb 2 19:36:28 EST 2008


Log message for revision 83435:
  Restructured configuration files to reduce repetition

Changed:
  A   z3c.securitytool/trunk/src/z3c/securitytool/concordTimesDummyViews.zcml
  A   z3c.securitytool/trunk/src/z3c/securitytool/concordTimesPrincipals.zcml
  U   z3c.securitytool/trunk/src/z3c/securitytool/configure.zcml
  U   z3c.securitytool/trunk/src/z3c/securitytool/site.zcml

-=-
Added: z3c.securitytool/trunk/src/z3c/securitytool/concordTimesDummyViews.zcml
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/concordTimesDummyViews.zcml	                        (rev 0)
+++ z3c.securitytool/trunk/src/z3c/securitytool/concordTimesDummyViews.zcml	2008-02-03 00:36:27 UTC (rev 83435)
@@ -0,0 +1,49 @@
+<configure
+      xmlns="http://namespaces.zope.org/zope"
+      xmlns:browser="http://namespaces.zope.org/browser"
+      i18n_domain="zope">
+
+  <browser:page 
+    name="ReadIssue.html"
+    permission="concord.ReadIssue"
+    for="*"
+    template="dummy.pt"
+    layer="z3c.securitytool.browser.IConcordTimesSkin"
+    />
+
+  <browser:page 
+    name="CreateIssue.html"
+    permission="concord.CreateIssue"
+    for="*"
+    template="dummy.pt"
+    layer="z3c.securitytool.browser.IConcordTimesSkin"
+    />
+
+  <browser:page 
+    name="DeleteIssue.html"
+    permission="concord.DeleteIssue"
+    for="*"
+    template="dummy.pt"
+    layer="z3c.securitytool.browser.IConcordTimesSkin"
+    />
+  <browser:page 
+    name="CreateArticle.html"
+    permission="concord.CreateArticle"
+    for="*"
+    template="dummy.pt"
+    layer="z3c.securitytool.browser.IConcordTimesSkin"
+    />
+
+  <browser:page 
+    name="DeleteArticle.html"
+    permission="concord.DeleteArticle"
+    for="*"
+    template="dummy.pt"
+    layer="z3c.securitytool.browser.IConcordTimesSkin"
+    />
+
+</configure>
+
+
+
+

Added: z3c.securitytool/trunk/src/z3c/securitytool/concordTimesPrincipals.zcml
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/concordTimesPrincipals.zcml	                        (rev 0)
+++ z3c.securitytool/trunk/src/z3c/securitytool/concordTimesPrincipals.zcml	2008-02-03 00:36:27 UTC (rev 83435)
@@ -0,0 +1,139 @@
+<configure
+      xmlns="http://namespaces.zope.org/zope"
+      xmlns:browser="http://namespaces.zope.org/browser"
+      i18n_domain="zope">
+
+<permission
+    id="concord.CreateArticle"
+    title="View Perm."
+    description="A Permission Used to View Issues"
+    />
+
+<permission
+    id="concord.DeleteArticle"
+    title="Del Article Perm."
+    description="A Permission Used to Delete Articles"
+    />
+
+<permission
+    id="concord.CreateIssue"
+    title="View Perm."
+    description="A Permission Used to Create Issues"
+    />
+
+<permission
+    id="concord.DeleteIssue"
+    title="View Perm."
+    description="A Permission Used to Delete Issues"
+    />
+
+<permission
+    id="concord.ReadIssue"
+    title="View Perm."
+    description="A Permission Used to View Issues"
+    />
+
+  <permission
+    id="concord.PublishIssue"
+    title="View Perm."
+    description="A Permission Used to Publish Issues"
+    />
+
+  <unauthenticatedPrincipal
+    id="zope.anybody"
+    title="Unauthenticated User"
+    />
+
+  <principal
+    id="zope.sample_manager"
+    title="Sample Manager"
+    login="admin"
+    password="admin"
+    />
+
+  <principal
+    id="zope.daniel"
+    title="Daniel "
+    login="daniel"
+    password="123"
+    />
+
+  <principal
+    id="zope.martin"
+    title="Martin"
+    login="martin"
+    password="123"
+    />
+
+  <principal
+    id="zope.randy"
+    title="Randy"
+    login="randy"
+    password="123"
+    />
+
+  <principal
+    id="zope.markus"
+    title="Markus"
+    login="markus"
+    password="123"
+    />
+
+  <principal
+    id="zope.stephan"
+    title="Stephan"
+    login="stephan"
+    password="123"
+    />
+
+  <role id="zope.Janitor" title="Janitor" />
+  <role id="zope.Editor" title="Editor" />
+  <role id="zope.Writer" title="Writer" />
+
+  <grant  role="zope.Janitor"   principal="zope.daniel"  />
+  <grant  role="zope.Janitor"   principal="zope.stephan" />
+
+  <grant  role="zope.Writer"    principal="zope.randy"   />
+  <grant  role="zope.Writer"    principal="zope.martin"  />
+
+  <grant  role="zope.Editor"    principal="zope.markus"  />
+
+
+  <grant permission="concord.CreateIssue"     role="zope.Editor" />
+  <grant permission="concord.DeleteIssue"     role="zope.Editor" />
+  <grant permission="concord.PublishIssue"    role="zope.Editor" />
+
+  <grant permission="concord.CreateArticle"   role="zope.Editor" />
+  <grant permission="concord.CreateArticle"   role="zope.Writer" />
+
+  <grant permission="concord.DeleteArticle"   role="zope.Writer" />
+  <grant permission="concord.DeleteArticle"   role="zope.Editor" />
+
+  <grant permission="concord.ReadIssue"       role="zope.Editor" />
+  <grant permission="concord.ReadIssue"       role="zope.Janitor" />
+  <grant permission="concord.ReadIssue"       role="zope.Writer" />
+
+  <role id="zope.Anonymous" title="Everybody" />
+  <role id="zope.Manager" title="Manager" />
+
+
+  <!-- And the Boiler Plate --> 
+
+  <grant
+    role="zope.Manager"
+    principal="zope.sample_manager"
+    />
+
+  <grant
+    role="zope.Anonymous"
+    principal="zope.anybody"
+    />
+
+  <grantAll role="zope.Manager" />
+
+  <grant permission="zope.View"
+                  role="zope.Anonymous" />
+  <grant permission="zope.app.dublincore.view"
+                  role="zope.Anonymous" />
+
+</configure>

Modified: z3c.securitytool/trunk/src/z3c/securitytool/configure.zcml
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/configure.zcml	2008-02-03 00:35:22 UTC (rev 83434)
+++ z3c.securitytool/trunk/src/z3c/securitytool/configure.zcml	2008-02-03 00:36:27 UTC (rev 83435)
@@ -1,11 +1,27 @@
 <configure 
     xmlns="http://namespaces.zope.org/zope"
     >
-  <include package=".browser" />    
 
+    <!--adapter Test Adapter
+      factory=".securitytool.SecurityChecker"
+      provides="z3c.securitytool.interfaces.ISecurityChecker"
+      name="securityToolChecker"
+      permission="zope.Public"
+    /-->
+
   <adapter
       factory=".securitytool.SecurityChecker"
       for="*"
       />
 
-</configure>
\ No newline at end of file
+  <interface
+    interface="z3c.securitytool.browser.IConcordTimesSkin"
+    type="zope.publisher.interfaces.browser.IBrowserSkinType"
+    name="ConcordTimes"
+    />
+
+
+  <include package=".browser" />    
+
+
+</configure>

Modified: z3c.securitytool/trunk/src/z3c/securitytool/site.zcml
===================================================================
--- z3c.securitytool/trunk/src/z3c/securitytool/site.zcml	2008-02-03 00:35:22 UTC (rev 83434)
+++ z3c.securitytool/trunk/src/z3c/securitytool/site.zcml	2008-02-03 00:36:27 UTC (rev 83435)
@@ -4,199 +4,29 @@
       i18n_domain="zope">
 
   <include package="zope.app.zcmlfiles" />
+
   <include package="zope.app.authentication" />
   <include package="zope.app.securitypolicy" />
+  <include package="zope.app.securitypolicy" file="meta.zcml" />
+
   <include package="zope.app.session" />
   <include package="zope.app.twisted" />
-  <include package="z3c.macro" />
 
-
+  <include package="z3c.macro" />
   <include package="z3c.macro" file="meta.zcml" />
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
-
-  <include package="z3c.securitytool" file="configure.zcml" />
   <include package="z3c.layer.minimal" />
 
-  <interface
-    interface="z3c.securitytool.browser.IConcordTimesSkin"
-    type="zope.publisher.interfaces.browser.IBrowserSkinType"
-    name="ConcordTimes"
-    />
 
-  <browser:defaultView for="*" name="vum.html" />
-
-
   <securityPolicy
     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
-  <role id="zope.Anonymous" title="Everybody" />
-  <role id="zope.Manager" title="Manager" />
 
-  <role id="zope.Janitor" title="Janitor" />
-  <role id="zope.Editor" title="Editor" />
-  <role id="zope.Writer" title="Writer" />
+  <include package="z3c.securitytool"/>
+  <include package="z3c.securitytool" file="concordTimesPrincipals.zcml"/>
+  <include package="z3c.securitytool" file="concordTimesDummyViews.zcml"/>
 
-<permission
-    id="concord.CreateArticle"
-    title="Create ConcordTimes Article"
-    description="A Permission Used to View Issues"
-    />
+  <browser:defaultView for="*" name="vum.html"/>
 
-<permission
-    id="concord.DeleteArticle"
-    title="Delete ConcordTimes Article"
-    description="A Permission Used to Delete Articles"
-    />
-
-<permission
-    id="concord.CreateIssue"
-    title="Create ConcordTimes Issue"
-    description="A Permission Used to Create Issues"
-    />
-
-<permission
-    id="concord.DeleteIssue"
-    title="Delete ConcordTimes Issue"
-    description="A Permission Used to Delete Issues"
-    />
-
-<permission
-    id="concord.ReadIssue"
-    title="Read ConcordTimes ISsue"
-    description="A Permission Used to View Issues"
-    />
-
-<permission
-    id="concord.PublishIssue"
-    title="Publish ConcordTimes Issue"
-    description="A Permission Used to Publish Issues"
-    />
-
-
-
-  <unauthenticatedPrincipal
-    id="zope.anybody"
-    title="Unauthenticated User"
-    />
-
-  <grant
-    role="zope.Anonymous"
-    principal="zope.anybody"
-    />
-
-  <principal
-    id="zope.sample_manager"
-    title="Sample Manager"
-    login="admin"
-    password="admin"
-    />
-
-  <principal
-    id="zope.daniel"
-    title="Daniel "
-    login="daniel"
-    password="123"
-    />
-
-  <principal
-    id="zope.martin"
-    title="Martin"
-    login="martin"
-    password="123"
-    />
-
-  <principal
-    id="zope.randy"
-    title="Randy"
-    login="randy"
-    password="123"
-    />
-
-  <principal
-    id="zope.markus"
-    title="Markus"
-    login="markus"
-    password="123"
-    />
-
-  <principal
-    id="zope.stephan"
-    title="Stephan"
-    login="stephan"
-    password="123"
-    />
-
-
-  <grant
-    role="zope.Manager"
-    principal="zope.sample_manager"
-    />
-
-  <grantAll role="zope.Manager" />
-
-  <grant  role="zope.Janitor"   principal="zope.daniel"  />
-  <grant  role="zope.Janitor"   principal="zope.stephan" />
-
-  <grant  role="zope.Writer"    principal="zope.randy"   />
-  <grant  role="zope.Writer"    principal="zope.martin"  />
-
-  <grant  role="zope.Editor"    principal="zope.markus"  />
-
-
-  <grant permission="concord.CreateIssue"     role="zope.Editor" />
-  <grant permission="concord.DeleteIssue"     role="zope.Editor" />
-  <grant permission="concord.PublishIssue"    role="zope.Editor" />
-
-  <grant permission="concord.CreateArticle"   role="zope.Editor" />
-  <grant permission="concord.CreateArticle"   role="zope.Writer" />
-
-  <grant permission="concord.DeleteArticle"   role="zope.Writer" />
-  <grant permission="concord.DeleteArticle"   role="zope.Editor" />
-
-  <grant permission="concord.ReadIssue"       role="zope.Editor" />
-  <grant permission="concord.ReadIssue"       role="zope.Janitor" />
-  <grant permission="concord.ReadIssue"       role="zope.Writer" />
-
-
-  <browser:page 
-    name="ReadIssue.html"
-    permission="concord.ReadIssue"
-    for="*"
-    template="dummy.pt"
-    layer="z3c.securitytool.browser.IConcordTimesSkin"
-    />
-
-  <browser:page 
-    name="CreateIssue.html"
-    permission="concord.CreateIssue"
-    for="*"
-    template="dummy.pt"
-    layer="z3c.securitytool.browser.IConcordTimesSkin"
-    />
-
-  <browser:page 
-    name="DeleteIssue.html"
-    permission="concord.DeleteIssue"
-    for="*"
-    template="dummy.pt"
-    layer="z3c.securitytool.browser.IConcordTimesSkin"
-    />
-  <browser:page 
-    name="CreateArticle.html"
-    permission="concord.CreateArticle"
-    for="*"
-    template="dummy.pt"
-    layer="z3c.securitytool.browser.IConcordTimesSkin"
-    />
-
-  <browser:page 
-    name="DeleteArticle.html"
-    permission="concord.DeleteArticle"
-    for="*"
-    template="dummy.pt"
-    layer="z3c.securitytool.browser.IConcordTimesSkin"
-    />
-
 </configure>
 
 



More information about the Checkins mailing list