[Checkins] SVN: Grokstar/trunk/ UPdate for eggified grok

[Philipp von Weitershausen]

Log message for revision 77782:
  UPdate for eggified grok
  

Changed:
  U   Grokstar/trunk/buildout.cfg
  U   Grokstar/trunk/setup.py
  U   Grokstar/trunk/src/grokstar/configure.zcml

-=-
Modified: Grokstar/trunk/buildout.cfg
===================================================================
--- Grokstar/trunk/buildout.cfg	2007-07-12 16:39:40 UTC (rev 77781)
+++ Grokstar/trunk/buildout.cfg	2007-07-12 17:00:43 UTC (rev 77782)
@@ -1,60 +1,54 @@
 [buildout]
 develop = .
-parts = zope3 data instance test
+parts = app data instance test
 
 [zope3]
-recipe = zc.recipe.cmmi
-extra_options = --with-python=${buildout:executable} --force
-url = http://www.zope.org/Products/Zope3/3.3.1/Zope-3.3.1.tgz
+# this dead chicken is needed by some other recipe(s)
+location =
 
-# If you already have a Zope 3 installation, you can *remove* the
-# 'zope3' name from the 'parts' listing in the [buildout] section, and
-# uncomment what's below.
-# [zope3]
-# location = /home/faassen/buildout/Zope3.3
-
 [data]
 recipe = zc.recipe.filestorage
 
-[instance]
-recipe = zc.recipe.zope3instance
-database = data
-user = grok:grok
-eggs = setuptools
-       grok
-       grokstar
+[app]
+recipe = zc.zope3recipes:app
+eggs = Grokstar
+site.zcml = <include package="grokstar" />
+            <include package="zope.app.twisted" />
 
-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.twisted
-       grok
-       grok-meta
-       grokstar
-       hurry.query
-       zc.catalog
-       hurry.workflow
+            <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" />
+
+[instance]
+recipe = zc.zope3recipes:instance
+application = app
+zope.conf = ${data:zconfig}
+
 [test]
 recipe = zc.recipe.testrunner
-eggs = grokstar
-extra-paths = parts/zope3/src
-working-directory = parts/instance
-defaults = ['--tests-pattern', '^f?tests$',
-            '-v'
-           ]
+eggs = grok
+defaults = ['--tests-pattern', '^f?tests$', '-v']

Modified: Grokstar/trunk/setup.py
===================================================================
--- Grokstar/trunk/setup.py	2007-07-12 16:39:40 UTC (rev 77781)
+++ Grokstar/trunk/setup.py	2007-07-12 17:00:43 UTC (rev 77782)
@@ -20,7 +20,7 @@
       zip_safe=False,
       install_requires=['setuptools',
                         'grok',
-                        'zc.catalog==1.1.1',
+                        'zc.catalog',
                         'hurry.query',
                         'hurry.workflow',
                         ],

Modified: Grokstar/trunk/src/grokstar/configure.zcml
===================================================================
--- Grokstar/trunk/src/grokstar/configure.zcml	2007-07-12 16:39:40 UTC (rev 77781)
+++ Grokstar/trunk/src/grokstar/configure.zcml	2007-07-12 17:00:43 UTC (rev 77782)
@@ -1,13 +1,5 @@
-<configure xmlns="http://namespaces.zope.org/grok" 
-           xmlns:browser="http://namespaces.zope.org/browser"
-           i18n_domain="grokstar">
-  <grok package="." />
-  
-  <browser:addMenuItem
-    class=".blog.Blog"
-    title="Grokstar"
-    description="Grokstar"
-    permission="zope.ManageContent"
-    />
-  
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:grok="http://namespaces.zope.org/grok">
+  <include package="grok" />
+  <grok:grok package="." />
 </configure>