Index: /main/waeup.sirp/branches/ulif-paster/buildout.cfg
===================================================================
--- /main/waeup.sirp/branches/ulif-paster/buildout.cfg	(revision 5489)
+++ /main/waeup.sirp/branches/ulif-paster/buildout.cfg	(revision 5490)
@@ -1,10 +1,31 @@
 [buildout]
 develop = .
-parts = app data zopectl i18n test waeupdocs coverage-detect coverage-report
-#find-links = http://download.zope.org/distribution/
-#newest = false
-#extends= http://grok.zope.org/releaseinfo/grok-1.0.cfg
+parts =
+    eggbasket
+    app
+    i18n
+    test
+    mkdirs
+    zpasswd
+    zope_conf
+    site_zcml
+    zdaemon_conf
+    deploy_ini
+    debug_ini
+    waeupdocs
+    coverage-detect
+    coverage-report
+# For backward compatibility, telling buildout not to throw away
+# the data and log subdirectories from the parts directory.
+    data
+    log
+newest = false
+
+#extends = versions.cfg
 extends= http://grok.zope.org/releaseinfo/grok-1.1.cfg
-#extends = http://svn.zope.org/*checkout*/groktoolkit/trunk/grok.cfg
+# eggs will be installed in the default buildout location
+# (see .buildout/default.cfg in your home directory)
+# unless you specify an eggs-directory option here.
+
 versions = versions
 
@@ -21,62 +42,94 @@
 lovely.recipe = 1.0.0    # Pinned to prevent buildout svn-error.
 
+
 [app]
-recipe = zc.zope3recipes>=0.5.3:application
+recipe = zc.recipe.egg
 eggs = waeup.sirp
-site.zcml = <include package="waeup.sirp" />
-            <include package="zope.app.twisted" />
-            <configure i18n_domain="waeup.sirp">
-              <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"
-                         />
+       z3c.evalexception>=2.0
+       Paste
+       PasteScript
+       PasteDeploy
+interpreter = python-console
 
-	      <grant permission="zope.View"
-                     principal="zope.Authenticated" />
-	      <grant permission="zope.app.dublincore.view"
-                     principal="zope.Authenticated" />
+[mkdirs]
+recipe = z3c.recipe.mkdir
+paths =
+    ${zope_conf:filestorage}
+    ${zope_conf:logfiles}
+    ${zope_conf:blobstorage}
 
-              <!-- 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" />
+[test]
+recipe = zc.recipe.testrunner
+eggs = waeup.sirp
+defaults = ['--tests-pattern', '^f?tests$', '-v']
 
-	      <grant permission="waeup.Public"
-                     principal="zope.Everybody" />
-          <grant permission="waeup.Anonymous"
-                     principal="zope.Anybody" />
+# this section named so that the i18n scripts are called bin/i18n...
+[i18n]
+recipe = z3c.recipe.i18n:i18n
+packages = waeup.sirp
+eggs = waeup.sirp
+domain = waeup.sirp
+output = src/waeup/sirp/locales
+zcml =
 
-              <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>
+# This section is named so that the zpasswd utility is
+# called `zpasswd`
+[zpasswd]
+recipe = z3c.recipe.dev:script
+eggs = waeup.sirp
+module = zope.app.server.zpasswd
+method = main
 
+[zope_conf]
+recipe = collective.recipe.template
+input = etc/zope.conf.in
+output = ${buildout:parts-directory}/etc/zope.conf
+filestorage = ${buildout:directory}/var/filestorage
+blobstorage = ${buildout:directory}/var/blobstorage
+logfiles = ${buildout:directory}/var/log
+extra =
+# extra = <grokwarnings>True</grokwarnings>
+# 'extra' is copied verbatim. Use it for product config sections and so.
+
+# The [data] and [log] parts are still in here to instruct buildout to not
+# unintentionally throw away the parts/data and parts/log subdirectories
+# that contain the Data.fs and the log files. These files should be
+# copied to the new locations. See the upgrade notes for more information.
 [data]
 recipe = zc.recipe.filestorage
 
-# this section named so that the start/stop script is called bin/zopectl
-[zopectl]
-recipe = zc.zope3recipes:instance
-application = app
-zope.conf = ${data:zconfig}
+[log]
+recipe = zc.recipe.filestorage
 
-[test]
-recipe = zc.recipe.testrunner
-eggs = waeup.sirp [test]
-defaults = ['--tests-pattern', '^f?tests$', '-v']
+[site_zcml]
+recipe = collective.recipe.template
+input = etc/site.zcml.in
+output = ${buildout:parts-directory}/etc/site.zcml
+
+[zdaemon_conf]
+recipe = collective.recipe.template
+input = etc/zdaemon.conf.in
+output = ${buildout:parts-directory}/etc/zdaemon.conf
+
+[deploy_ini]
+recipe = collective.recipe.template
+input = etc/deploy.ini.in
+output = ${buildout:parts-directory}/etc/deploy.ini
+
+[debug_ini]
+recipe = collective.recipe.template
+input = etc/debug.ini.in
+output = ${buildout:parts-directory}/etc/debug.ini
+
+[eggbasket]
+recipe = z3c.recipe.eggbasket
+eggs = grok
+url = http://grok.zope.org/releaseinfo/grok-eggs-1.1.tgz
+
+[waeupdocs]
+recipe = collective.recipe.sphinxbuilder
+eggs = waeup.sirp
+source = ${buildout:directory}/docs/source
+build = ${buildout:directory}/docs/build
 
 # Collect test coverage data.
@@ -94,18 +147,2 @@
 scripts = coveragereport
 arguments = ('${buildout:parts-directory}/coverage-detect/coverage', '${buildout:directory}/coverage-report')
-
-
-
-# this section named so that the i18n scripts are called bin/i18n...
-[i18n]
-recipe = lovely.recipe:i18n
-package = waeup.sirp
-domain = waeup.sirp
-location = src/waeup/sirp
-output = locales
-
-[waeupdocs]
-recipe = collective.recipe.sphinxbuilder
-eggs = waeup.sirp
-source = ${buildout:directory}/docs/source
-build = ${buildout:directory}/docs/build
