[z3-checkins] r43995 - in z3/NudgeNudge/trunk: . src/nudgenudge

[philikon at codespeak.net]

Author: philikon
Date: Sat Jun  2 17:01:24 2007
New Revision: 43995

Added:
   z3/NudgeNudge/trunk/src/nudgenudge/site.zcml   (contents, props changed)
Modified:
   z3/NudgeNudge/trunk/buildout.cfg
   z3/NudgeNudge/trunk/nudge.ini
Log:
The nudgenudge package now comes with a site.zcml that's used to run the app.
Use the new recipes from zc.zope3recipes to create the Zope 3 instance (and change
the PasteDeploy config to match the new paths).


Modified: z3/NudgeNudge/trunk/buildout.cfg
==============================================================================
--- z3/NudgeNudge/trunk/buildout.cfg	(original)
+++ z3/NudgeNudge/trunk/buildout.cfg	Sat Jun  2 17:01:24 2007
@@ -1,13 +1,15 @@
 [buildout]
-parts = data instance server test
+parts = app data instance server test
 develop = . deliverance
+find-links = http://download.zope.org/distribution/
 
 [zope3]
-location = /usr/local/Zope-3.3.1
+# this dead chicken is needed by some other recipe(s)
+location =
 
 [server]
 recipe = zc.recipe.egg
-eggs = ${instance:eggs}
+eggs = ${app:eggs}
 	zope.paste
 	PasteDeploy
 	Deliverance
@@ -15,46 +17,23 @@
 	WSGIUtils
 extra-paths = ${zope3:location}/lib/python
 
-[instance]
+[app]
 database = data
 eggs = setuptools
 	grok
-	zc.catalog==1.1.1
-	nudgenudge
-recipe = zc.recipe.zope3instance
-user = grok:grok
-zcml = zope.annotation
-	zope.copypastemove
-	zope.formlib
-	zope.i18n-meta
-	zope.i18n.locales
-	zope.publisher
-	zope.security-meta
-	zope.size
-	zope.traversing
-	zope.traversing.browser
-	zope.app
-	zope.app-meta
-	zope.app.securitypolicy
-	zope.app.securitypolicy-meta
-	zope.app.authentication
-	zope.app.catalog
-	zope.app.intid
-	zope.app.keyreference
-	zope.app.session
-	zope.app.twisted
-	grok
-	grok-meta
 	nudgenudge
+recipe = zc.zope3recipes:app
+site.zcml = <include package="nudgenudge" file="site.zcml" />
 
 [data]
 recipe = zc.recipe.filestorage
 
+[instance]
+recipe = zc.zope3recipes:instance
+application = app
+zope.conf = ${data:zconfig}
+
 [test]
-working-directory = parts/instance
-eggs = nudgenudge
 recipe = zc.recipe.testrunner
-extra-paths = ${zope3:location}/lib/python
-defaults = ['--tests-pattern', '^f?tests$',
-	'-v'
-	]
+eggs = nudgenudge
+defaults = ['--tests-pattern', '^f?tests$', '-v']

Modified: z3/NudgeNudge/trunk/nudge.ini
==============================================================================
--- z3/NudgeNudge/trunk/nudge.ini	(original)
+++ z3/NudgeNudge/trunk/nudge.ini	Sat Jun  2 17:01:24 2007
@@ -11,7 +11,7 @@
 
 [app:zope]
 use = egg:zope.paste
-site_definition = parts/instance/etc/site.zcml
+site_definition = parts/app/site.zcml
 file_storage = parts/data/Data.fs
 
 [server:main]

Added: z3/NudgeNudge/trunk/src/nudgenudge/site.zcml
==============================================================================
--- (empty file)
+++ z3/NudgeNudge/trunk/src/nudgenudge/site.zcml	Sat Jun  2 17:01:24 2007
@@ -0,0 +1,60 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include package="zope.security" file="meta.zcml" />
+  <include package="zope.i18n" file="meta.zcml" />
+  <include package="zope.app.securitypolicy" file="meta.zcml" />
+  <include package="zope.app.zcmlfiles" file="meta.zcml" />
+  <include package="grok" file="meta.zcml" />
+
+  <include package="zope.annotation" />
+  <include package="zope.copypastemove" />
+  <include package="zope.formlib" />
+  <include package="zope.i18n.locales" />
+  <include package="zope.publisher" />
+  <include package="zope.size" />
+  <include package="zope.traversing" />
+  <include package="zope.traversing.browser" />
+  <include package="zope.publisher" />
+  <include package="zope.app.zcmlfiles" />
+  <include package="zope.app.securitypolicy" />
+  <include package="zope.app.authentication" />
+  <include package="zope.app.catalog" />
+  <include package="zope.app.intid" />
+  <include package="zope.app.keyreference" />
+  <include package="zope.app.session" />
+  <include package="zope.app.twisted" />
+  <include package="grok" />
+  <include package="nudgenudge" />
+
+  <securityPolicy 
+      component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+
+  <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="grok"
+             password_manager="Plain Text"
+             password="grok"
+             />
+
+  <!-- Replace the following directive if you don't want public access
+       -->
+  <grant permission="zope.View"
+         principal="zope.Anybody" />
+  <grant permission="zope.app.dublincore.view"
+         principal="zope.Anybody" />
+  
+  <role id="zope.Manager" title="Site Manager" />
+  <role id="zope.Member" title="Site Member" />
+  <grantAll role="zope.Manager" />
+  <grant role="zope.Manager"
+         principal="zope.manager" />
+
+</configure>
\ No newline at end of file