From tim at mail.se.linux.org  Tue Apr  1 23:18:48 2008
From: tim at mail.se.linux.org (tim at mail.se.linux.org)
Date: Tue, 01 Apr 2008 23:18:48 +0200
Subject: [commits] r188 -
	selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/workflows/news_workflow
Message-ID: <E1JgnsW-0004AV-5Y@mail.se.linux.org>

Author: tim
Date: 2008-04-01 23:18:47 +0200 (Tue, 01 Apr 2008)
New Revision: 188

Modified:
   selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/workflows/news_workflow/definition.xml
Log:
Fix so any member can add news items. The owner must have Modify portal content permissions on pending state, otherwise they can't edit the news item.


Modified: selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/workflows/news_workflow/definition.xml
===================================================================
--- selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/workflows/news_workflow/definition.xml	2008-03-31 15:58:43 UTC (rev 187)
+++ selinux-site/trunk/selinux.policy/selinux/policy/profiles/default/workflows/news_workflow/definition.xml	2008-04-01 21:18:47 UTC (rev 188)
@@ -9,7 +9,7 @@
  <permission>Modify portal content</permission>
  <permission>View</permission>
  <state state_id="pending" title="Pending">
-  <description>Waiting to be reviewed, not editable by the owner.</description>
+  <description>Waiting to be reviewed.</description>
   <exit-transition transition_id="publish"/>
   <permission-map name="Access contents information"
                   acquired="False">
@@ -37,6 +37,7 @@
   <permission-map name="Modify portal content"
                   acquired="False">
    <permission-role>Manager</permission-role>
+   <permission-role>Owner</permission-role>
    <permission-role>Reviewer</permission-role>
   </permission-map>
   <permission-map name="View" acquired="False">



From tim at mail.se.linux.org  Tue Apr  1 23:19:37 2008
From: tim at mail.se.linux.org (tim at mail.se.linux.org)
Date: Tue, 01 Apr 2008 23:19:37 +0200
Subject: [commits] r189 - selinux-site/trunk/buildout
Message-ID: <E1JgntJ-0004B1-W6@mail.se.linux.org>

Author: tim
Date: 2008-04-01 23:19:37 +0200 (Tue, 01 Apr 2008)
New Revision: 189

Modified:
   selinux-site/trunk/buildout/base.cfg
Log:
Update plone to 3.0.6.


Modified: selinux-site/trunk/buildout/base.cfg
===================================================================
--- selinux-site/trunk/buildout/base.cfg	2008-04-01 21:18:47 UTC (rev 188)
+++ selinux-site/trunk/buildout/base.cfg	2008-04-01 21:19:37 UTC (rev 189)
@@ -10,7 +10,7 @@
     selinux.policy
  
 [plone]
-recipe = plone.recipe.plone==3.0.4
+recipe = plone.recipe.plone==3.0.6
 
 [zope2]
 recipe = plone.recipe.zope2install



From tim at mail.se.linux.org  Tue Apr  1 23:20:52 2008
From: tim at mail.se.linux.org (tim at mail.se.linux.org)
Date: Tue, 01 Apr 2008 23:20:52 +0200
Subject: [commits] r190 - selinux-site/trunk/buildout
Message-ID: <E1JgnuW-0004Bi-I3@mail.se.linux.org>

Author: tim
Date: 2008-04-01 23:20:52 +0200 (Tue, 01 Apr 2008)
New Revision: 190

Modified:
   selinux-site/trunk/buildout/buildout.cfg
Log:
A new plone.portlet.static is released that's not compatible with our version of plone, so we tell explicitly to use an older version.


Modified: selinux-site/trunk/buildout/buildout.cfg
===================================================================
--- selinux-site/trunk/buildout/buildout.cfg	2008-04-01 21:19:37 UTC (rev 189)
+++ selinux-site/trunk/buildout/buildout.cfg	2008-04-01 21:20:52 UTC (rev 190)
@@ -1,2 +1,6 @@
 [buildout]
 extends = devel.cfg
+versions = versions
+
+[versions]
+plone.portlet.static = 1.0b3



From tim at mail.se.linux.org  Wed Apr  2 19:54:57 2008
From: tim at mail.se.linux.org (tim at mail.se.linux.org)
Date: Wed, 02 Apr 2008 19:54:57 +0200
Subject: [commits] r191 - selinux-site/trunk/buildout
Message-ID: <E1Jh7An-0007WS-QY@mail.se.linux.org>

Author: tim
Date: 2008-04-02 19:54:56 +0200 (Wed, 02 Apr 2008)
New Revision: 191

Modified:
   selinux-site/trunk/buildout/ploneldap.patch
Log:
The PloneLDAP patch didn't work correctly, the result was that the email for members wasn't found for example. This patch is now fixed.


Modified: selinux-site/trunk/buildout/ploneldap.patch
===================================================================
--- selinux-site/trunk/buildout/ploneldap.patch	2008-04-01 21:20:52 UTC (rev 190)
+++ selinux-site/trunk/buildout/ploneldap.patch	2008-04-02 17:54:56 UTC (rev 191)
@@ -29,7 +29,7 @@
 +                # so the properties need the right encoding
 +                encoded_properties = {}
 +                for key, value in properties.items():
-+                    if schema_dict[key][1]=="lines":
++                    if schema_dict.has_key(key) and schema_dict[key][1]=="lines":
 +                        encoded_value = [x.encode(self._encoding) for x in value]
 +                    else:
 +                        encoded_value = value.encode(self._encoding)



From tim at mail.se.linux.org  Thu Apr  3 22:20:04 2008
From: tim at mail.se.linux.org (tim at mail.se.linux.org)
Date: Thu, 03 Apr 2008 22:20:04 +0200
Subject: [commits] r192 - selinux-site/trunk/buildout/bin
Message-ID: <E1JhVum-0002zm-EO@mail.se.linux.org>

Author: tim
Date: 2008-04-03 22:20:03 +0200 (Thu, 03 Apr 2008)
New Revision: 192

Modified:
   selinux-site/trunk/buildout/bin/control
Log:
Fix the control script (start/stop/restart of zope) so it actually works.


Modified: selinux-site/trunk/buildout/bin/control
===================================================================
--- selinux-site/trunk/buildout/bin/control	2008-04-02 17:54:56 UTC (rev 191)
+++ selinux-site/trunk/buildout/bin/control	2008-04-03 20:20:03 UTC (rev 192)
@@ -7,9 +7,10 @@
 case "$1" in
     start)
         echo Starting Plone
-        for i in $INSTANCES do
+        for i in $INSTANCES
+        do
            echo "starting $i ..."
-           $mydir/$i start
+           ./bin/$i start
            /bin/sleep 3s
            echo
         done
@@ -17,19 +18,21 @@
 
     stop)
         echo Stopping Plone
-        for i in $INSTANCES do
+        for i in $INSTANCES
+        do
            echo "stopping $i ..."
-           $mydir/$i stop
+           ./bin/$i stop
            echo
         done
         ;;
 
     restart)
-        for i in $INSTANCES do
+        for i in $INSTANCES
+        do
            echo "Restarting $i ..."
-           $mydir/$i stop
+           ./bin/$i stop
            /bin/sleep 2s
-           $mydir/$i start
+           ./bin/$i start
            echo
         done
         ;;



From tim at mail.se.linux.org  Thu Apr  3 22:23:05 2008
From: tim at mail.se.linux.org (tim at mail.se.linux.org)
Date: Thu, 03 Apr 2008 22:23:05 +0200
Subject: [commits] r193 - selinux-site/trunk/buildout
Message-ID: <E1JhVxh-00030K-9g@mail.se.linux.org>

Author: tim
Date: 2008-04-03 22:23:04 +0200 (Thu, 03 Apr 2008)
New Revision: 193

Modified:
   selinux-site/trunk/buildout/production.cfg
Log:
Changed paths for sockets that are used for communication with the daemon manager. Changing paths allows us to run bin/control restart after bin/buildout. Before this change running bin/buildout removed the sockets and bin/control restart didn't work and you'd have to kill the zope process manually.


Modified: selinux-site/trunk/buildout/production.cfg
===================================================================
--- selinux-site/trunk/buildout/production.cfg	2008-04-03 20:20:03 UTC (rev 192)
+++ selinux-site/trunk/buildout/production.cfg	2008-04-03 20:23:04 UTC (rev 193)
@@ -47,7 +47,7 @@
     ${dist-products:location}
     ${common-dist-products:location}
     ${buildout:directory}/parts/common-svn-products
-zope-conf-additional =
+zope-conf-catalog =
   <zodb_db catalog>
     mount-point /selinux/portal_catalog
     container-class Products.CMFPlone.CatalogTool.CatalogTool
@@ -58,7 +58,13 @@
       cache-size 400MB
     </zeoclient>
   </zodb_db>
+zope-conf-additional =
+  ${zopeclient1:zope-conf-catalog}
+  <zoperunner>
+      socket-name ${buildout:directory}/var/zopectlsock-zopeclient1
+  </zoperunner>
 
+
 [zopeclient2]
 recipe = plone.recipe.zope2instance
 zope2-location = ${zope2:location}
@@ -74,7 +80,11 @@
 zcml = ${zopeclient1:zcml}
 effective-user = ${zopeclient1:effective-user}
 products = ${zopeclient1:products}
-zope-conf-additional = ${zopeclient1:zope-conf-additional}
+zope-conf-additional =
+  ${zopeclient1:zope-conf-catalog}
+  <zoperunner>
+      socket-name ${buildout:directory}/var/zopectlsock-zopeclient2
+  </zoperunner>
 
 [zopeclient3]
 recipe = plone.recipe.zope2instance
@@ -91,7 +101,11 @@
 zcml = ${zopeclient1:zcml}
 effective-user = ${zopeclient1:effective-user}
 products = ${zopeclient1:products}
-zope-conf-additional = ${zopeclient1:zope-conf-additional}
+zope-conf-additional =
+  ${zopeclient1:zope-conf-catalog}
+  <zoperunner>
+      socket-name ${buildout:directory}/var/zopectlsock-zopeclient3
+  </zoperunner>
 
 [zopeclient4]
 recipe = plone.recipe.zope2instance
@@ -108,7 +122,11 @@
 zcml = ${zopeclient1:zcml}
 effective-user = ${zopeclient1:effective-user}
 products = ${zopeclient1:products}
-zope-conf-additional = ${zopeclient1:zope-conf-additional}
+zope-conf-additional =
+  ${zopeclient1:zope-conf-catalog}
+  <zoperunner>
+      socket-name ${buildout:directory}/var/zopectlsock-zopeclient4
+  </zoperunner>
 
 [dist-products]
 recipe = plone.recipe.distros



