[z3-checkins] r47131 - in z3/NudgeNudge/trunk: . src/nudgenudge var
philikon at codespeak.net
philikon at codespeak.net
Wed Oct 3 22:17:44 CEST 2007
Author: philikon
Date: Wed Oct 3 22:17:44 2007
New Revision: 47131
Added:
z3/NudgeNudge/trunk/site.zcml
- copied, changed from r47126, z3/NudgeNudge/trunk/src/nudgenudge/site.zcml
z3/NudgeNudge/trunk/var/ (props changed)
Removed:
z3/NudgeNudge/trunk/src/nudgenudge/site.zcml
Modified:
z3/NudgeNudge/trunk/buildout.cfg
z3/NudgeNudge/trunk/nudge.ini
Log:
No longer use instances. Use the zopeproject-like model.
Modified: z3/NudgeNudge/trunk/buildout.cfg
==============================================================================
--- z3/NudgeNudge/trunk/buildout.cfg (original)
+++ z3/NudgeNudge/trunk/buildout.cfg Wed Oct 3 22:17:44 2007
@@ -1,5 +1,5 @@
[buildout]
-parts = app data instance server test
+parts = app test
develop = . deliverance
find-links = http://download.zope.org/distribution/
versions = versions
@@ -7,37 +7,17 @@
[versions]
ZODB3 = 3.8.0b2
-[zope3]
-# this dead chicken is needed by some other recipe(s)
-location =
-
-[server]
-recipe = zc.recipe.egg
-eggs = ${app:eggs}
- zope.paste
- PasteDeploy
- Deliverance
- PasteScript
- WSGIUtils
-extra-paths = ${zope3:location}/lib/python
-
[app]
-database = data
-eggs = setuptools
- grok
- 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}
+recipe = zc.recipe.egg
+eggs = NudgeNudge
+ zope.paste
+ Paste
+ PasteDeploy
+ PasteScript
+ Deliverance
+interpreter = python
[test]
recipe = zc.recipe.testrunner
-eggs = nudgenudge
+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 Wed Oct 3 22:17:44 2007
@@ -11,8 +11,8 @@
[app:zope]
use = egg:zope.paste
-site_definition = parts/app/site.zcml
-file_storage = parts/data/Data.fs
+site_definition = site.zcml
+file_storage = var/Data.fs
[server:main]
use = egg:Paste#http
Copied: z3/NudgeNudge/trunk/site.zcml (from r47126, z3/NudgeNudge/trunk/src/nudgenudge/site.zcml)
==============================================================================
--- z3/NudgeNudge/trunk/src/nudgenudge/site.zcml (original)
+++ z3/NudgeNudge/trunk/site.zcml Wed Oct 3 22:17:44 2007
@@ -1,34 +1,7 @@
<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"
Deleted: /z3/NudgeNudge/trunk/src/nudgenudge/site.zcml
==============================================================================
--- /z3/NudgeNudge/trunk/src/nudgenudge/site.zcml Wed Oct 3 22:17:44 2007
+++ (empty file)
@@ -1,60 +0,0 @@
-<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
More information about the z3-checkins
mailing list