[Zope-Checkins] SVN: Zope/trunk/ Moved ``Products/Five/security.py`` into the AccessControl package.

2009-07-30 Thread Hanno Schlichting
Log message for revision 102404:
  Moved ``Products/Five/security.py`` into the AccessControl package.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/AccessControl/permissions.zcml
  A   Zope/trunk/src/AccessControl/security.py
  U   Zope/trunk/src/Products/Five/browser/metaconfigure.py
  U   Zope/trunk/src/Products/Five/browser/tests/test_menu.py
  U   Zope/trunk/src/Products/Five/browser/tests/test_zope3security.py
  U   Zope/trunk/src/Products/Five/form/metaconfigure.py
  U   Zope/trunk/src/Products/Five/metaconfigure.py
  U   Zope/trunk/src/Products/Five/permissions.zcml
  U   Zope/trunk/src/Products/Five/security.py
  U   Zope/trunk/src/Products/Five/tests/test_security.py
  U   Zope/trunk/src/Products/Five/viewlet/metaconfigure.py
  U   Zope/trunk/src/Testing/ZopeTestCase/placeless.py
  U   Zope/trunk/src/Zope2/utilities/skel/etc/site.zcml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst  2009-07-30 20:17:45 UTC (rev 102403)
+++ Zope/trunk/doc/CHANGES.rst  2009-07-30 20:25:28 UTC (rev 102404)
@@ -11,6 +11,8 @@
 Restructuring
 +
 
+- Moved ``Products/Five/security.py`` into the AccessControl package.
+
 - Moved ``Products/Five/traversing.zcml`` directly into the configure.zcml.
 
 - Moved zope.security-style permission registrations from Products.Five into

Modified: Zope/trunk/src/AccessControl/permissions.zcml
===
--- Zope/trunk/src/AccessControl/permissions.zcml   2009-07-30 20:17:45 UTC 
(rev 102403)
+++ Zope/trunk/src/AccessControl/permissions.zcml   2009-07-30 20:25:28 UTC 
(rev 102404)
@@ -1,6 +1,13 @@
 http://namespaces.zope.org/zope";
i18n_domain="Zope2">
 
+  
+  
+
   
+directive), create the equivalent Zope2 style permission.
+"""
+
+global _registeredPermissions
+
+# Zope 2 uses string, not unicode yet
+zope2_permission = str(permission.title)
+roles = ('Manager',)
+
+if not _registeredPermissions.has_key(zope2_permission):
+_registeredPermissions[zope2_permission] = 1
+
+Products.__ac_permissions__ += ((zope2_permission, (), roles,),)
+
+mangled = pname(zope2_permission)
+setattr(ApplicationDefaultPermissions, mangled, roles)

Modified: Zope/trunk/src/Products/Five/browser/metaconfigure.py
===
--- Zope/trunk/src/Products/Five/browser/metaconfigure.py   2009-07-30 
20:17:45 UTC (rev 102403)
+++ Zope/trunk/src/Products/Five/browser/metaconfigure.py   2009-07-30 
20:25:28 UTC (rev 102404)
@@ -37,6 +37,12 @@
 from zope.app.publisher.browser.viewmeta import _handle_menu
 from zope.app.publisher.browser.viewmeta import _handle_for
 
+from AccessControl.security import getSecurityInfo
+from AccessControl.security import protectClass
+from AccessControl.security import protectName
+from AccessControl.security import CheckerPrivateId
+from App.class_init import InitializeClass
+
 from Products.Five.browser import BrowserView
 from Products.Five.browser.resource import FileResourceFactory
 from Products.Five.browser.resource import ImageResourceFactory
@@ -44,12 +50,7 @@
 from Products.Five.browser.resource import DirectoryResourceFactory
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.Five.metaclass import makeClass
-from Products.Five.security import getSecurityInfo
-from Products.Five.security import protectClass
-from Products.Five.security import protectName
-from Products.Five.security import CheckerPrivateId
 
-from App.class_init import InitializeClass
 
 def page(_context, name, permission, for_,
  layer=IDefaultBrowserLayer, template=None, class_=None,

Modified: Zope/trunk/src/Products/Five/browser/tests/test_menu.py
===
--- Zope/trunk/src/Products/Five/browser/tests/test_menu.py 2009-07-30 
20:17:45 UTC (rev 102403)
+++ Zope/trunk/src/Products/Five/browser/tests/test_menu.py 2009-07-30 
20:25:28 UTC (rev 102404)
@@ -30,7 +30,7 @@
   >>> zcml.load_config("permissions.zcml", AccessControl)
   >>> zcml.load_config('menu.zcml', package=Products.Five.browser.tests)
 
-  >>> from Products.Five.security import newInteraction
+  >>> from AccessControl.security import newInteraction
   >>> newInteraction()
 
 Now for some actual testing... Let's look up the menu we registered:

Modified: Zope/trunk/src/Products/Five/browser/tests/test_zope3security.py
===
--- Zope/trunk/src/Products/Five/browser/tests/test_zope3security.py
2009-07-30 20:17:45 UTC (rev 102403)
+++ Zope/trunk/src/Products/Five/browser/tests/test_zope3security.py
2009-07-30 20:25:28 UTC (rev 102404)
@@ -11,7 +11,7 @@
   ... xmlns="http://namespaces.zope.org/zope";
   ...   

[Zope-Checkins] SVN: Zope/branches/2.12/ Updated to new ZODB3 = 3.9.0b4

2009-07-30 Thread Hanno Schlichting
Log message for revision 102398:
  Updated to new ZODB3 = 3.9.0b4
  

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/versions.cfg

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===
--- Zope/branches/2.12/doc/CHANGES.rst  2009-07-30 19:55:27 UTC (rev 102397)
+++ Zope/branches/2.12/doc/CHANGES.rst  2009-07-30 19:58:14 UTC (rev 102398)
@@ -13,6 +13,7 @@
 
 - Updated packages:
 
+  - ZODB3 = 3.9.0b4
   - zope.testing = 3.7.7
 
 - scripts: Added 'runzope' and 'zopectl' as entry points for instance scripts.

Modified: Zope/branches/2.12/versions.cfg
===
--- Zope/branches/2.12/versions.cfg 2009-07-30 19:55:27 UTC (rev 102397)
+++ Zope/branches/2.12/versions.cfg 2009-07-30 19:58:14 UTC (rev 102398)
@@ -13,7 +13,7 @@
 ClientForm = 0.2.10
 RestrictedPython = 3.5.1
 ZConfig = 2.7.1
-ZODB3 = 3.9.0b2
+ZODB3 = 3.9.0b4
 docutils = 0.5
 lxml = 2.2
 mechanize = 0.1.11

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/versions.cfg Merged c102398 from the 2.12 branch

2009-07-30 Thread Hanno Schlichting
Log message for revision 102399:
  Merged c102398 from the 2.12 branch
  

Changed:
  U   Zope/trunk/versions.cfg

-=-
Modified: Zope/trunk/versions.cfg
===
--- Zope/trunk/versions.cfg 2009-07-30 19:58:14 UTC (rev 102398)
+++ Zope/trunk/versions.cfg 2009-07-30 19:59:01 UTC (rev 102399)
@@ -12,7 +12,7 @@
 ClientForm = 0.2.10
 RestrictedPython = 3.5.1
 ZConfig = 2.7.1
-ZODB3 = 3.9.0b2
+ZODB3 = 3.9.0b4
 docutils = 0.5
 lxml = 2.2
 mechanize = 0.1.11

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Moved ``Products/Five/traversing.zcml`` directly into the configure.zcml.

2009-07-30 Thread Hanno Schlichting
Log message for revision 102397:
  Moved ``Products/Five/traversing.zcml`` directly into the configure.zcml.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Products/Five/configure.zcml
  D   Zope/trunk/src/Products/Five/traversing.zcml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst  2009-07-30 19:55:18 UTC (rev 102396)
+++ Zope/trunk/doc/CHANGES.rst  2009-07-30 19:55:27 UTC (rev 102397)
@@ -11,6 +11,8 @@
 Restructuring
 +
 
+- Moved ``Products/Five/traversing.zcml`` directly into the configure.zcml.
+
 - Moved zope.security-style permission registrations from Products.Five into
   the AccessControl package.
 

Modified: Zope/trunk/src/Products/Five/configure.zcml
===
--- Zope/trunk/src/Products/Five/configure.zcml 2009-07-30 19:55:18 UTC (rev 
102396)
+++ Zope/trunk/src/Products/Five/configure.zcml 2009-07-30 19:55:27 UTC (rev 
102397)
@@ -4,8 +4,8 @@
   
   
   
-  
 
+  
   
   
 

Deleted: Zope/trunk/src/Products/Five/traversing.zcml
===
--- Zope/trunk/src/Products/Five/traversing.zcml2009-07-30 19:55:18 UTC 
(rev 102396)
+++ Zope/trunk/src/Products/Five/traversing.zcml2009-07-30 19:55:27 UTC 
(rev 102397)
@@ -1,7 +0,0 @@
-http://namespaces.zope.org/zope";
-   xmlns:five="http://namespaces.zope.org/five";>
-
-  
-  
-
-

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Moved ``Products/Five/i18n.zcml`` into the ZPublisher package.

2009-07-30 Thread Hanno Schlichting
Log message for revision 102393:
  Moved ``Products/Five/i18n.zcml`` into the ZPublisher package.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Products/Five/configure.zcml
  U   Zope/trunk/src/Products/Five/i18n.zcml
  U   Zope/trunk/src/ZPublisher/configure.zcml
  A   Zope/trunk/src/ZPublisher/i18n.zcml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst  2009-07-30 19:40:57 UTC (rev 102392)
+++ Zope/trunk/doc/CHANGES.rst  2009-07-30 19:51:52 UTC (rev 102393)
@@ -14,6 +14,8 @@
 - Moved zope.security-style permission registrations from Products.Five into
   the AccessControl package.
 
+- Moved ``Products/Five/i18n.zcml`` into the ZPublisher package.
+
 - Moved ``Products/Five/publisher.zcml`` into the ZPublisher package.
 
 - Moved ``Products/Five/event.zcml`` into the OFS package.

Modified: Zope/trunk/src/Products/Five/configure.zcml
===
--- Zope/trunk/src/Products/Five/configure.zcml 2009-07-30 19:40:57 UTC (rev 
102392)
+++ Zope/trunk/src/Products/Five/configure.zcml 2009-07-30 19:51:52 UTC (rev 
102393)
@@ -3,7 +3,6 @@
 
   
   
-  
   
   
 

Modified: Zope/trunk/src/Products/Five/i18n.zcml
===
--- Zope/trunk/src/Products/Five/i18n.zcml  2009-07-30 19:40:57 UTC (rev 
102392)
+++ Zope/trunk/src/Products/Five/i18n.zcml  2009-07-30 19:51:52 UTC (rev 
102393)
@@ -1,23 +1,6 @@
 http://namespaces.zope.org/zope";
-xmlns:i18n="http://namespaces.zope.org/i18n";
->
+xmlns="http://namespaces.zope.org/zope";>
 
-  
+  
 
-  
-
-  
-
 

Modified: Zope/trunk/src/ZPublisher/configure.zcml
===
--- Zope/trunk/src/ZPublisher/configure.zcml2009-07-30 19:40:57 UTC (rev 
102392)
+++ Zope/trunk/src/ZPublisher/configure.zcml2009-07-30 19:51:52 UTC (rev 
102393)
@@ -1,5 +1,6 @@
 http://namespaces.zope.org/zope";>
 
+  
   
 
 

Copied: Zope/trunk/src/ZPublisher/i18n.zcml (from rev 102379, 
Zope/trunk/src/Products/Five/i18n.zcml)
===
--- Zope/trunk/src/ZPublisher/i18n.zcml (rev 0)
+++ Zope/trunk/src/ZPublisher/i18n.zcml 2009-07-30 19:51:52 UTC (rev 102393)
@@ -0,0 +1,22 @@
+http://namespaces.zope.org/zope";
+xmlns:i18n="http://namespaces.zope.org/i18n";>
+
+  
+
+  
+
+  
+
+

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Moved zope.security-style permission registrations from Products.Five into the AccessControl package.

2009-07-30 Thread Hanno Schlichting
Log message for revision 102392:
  Moved zope.security-style permission registrations from Products.Five into 
the AccessControl package.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/AccessControl/Permissions.py
  A   Zope/trunk/src/AccessControl/configure.zcml
  A   Zope/trunk/src/AccessControl/permissions.zcml
  U   Zope/trunk/src/Products/Five/browser/tests/test_defaultview.py
  U   Zope/trunk/src/Products/Five/browser/tests/test_menu.py
  U   Zope/trunk/src/Products/Five/permissions.zcml
  U   Zope/trunk/src/Products/Five/utilities/browser/tests/test_marker.py
  U   Zope/trunk/src/Testing/ZopeTestCase/testPlaceless.py

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst  2009-07-30 19:29:29 UTC (rev 102391)
+++ Zope/trunk/doc/CHANGES.rst  2009-07-30 19:40:57 UTC (rev 102392)
@@ -11,6 +11,9 @@
 Restructuring
 +
 
+- Moved zope.security-style permission registrations from Products.Five into
+  the AccessControl package.
+
 - Moved ``Products/Five/publisher.zcml`` into the ZPublisher package.
 
 - Moved ``Products/Five/event.zcml`` into the OFS package.

Modified: Zope/trunk/src/AccessControl/Permissions.py
===
--- Zope/trunk/src/AccessControl/Permissions.py 2009-07-30 19:29:29 UTC (rev 
102391)
+++ Zope/trunk/src/AccessControl/Permissions.py 2009-07-30 19:40:57 UTC (rev 
102392)
@@ -39,6 +39,7 @@
 change_page_templates='Change Page Templates'
 change_permissions='Change permissions'
 change_proxy_roles='Change proxy roles'
+copy_or_move='Copy or Move'
 create_class_instances='Create class instances'
 define_permissions='Define permissions'
 delete_objects='Delete objects'
@@ -63,7 +64,6 @@
 view='View'
 view_history='View History'
 view_management_screens='View management screens'
-copy_or_move='Copy or Move'
 webdav_access='WebDAV access'
 webdav_lock_items='WebDAV Lock items'
 webdav_unlock_items='WebDAV Unlock items'

Added: Zope/trunk/src/AccessControl/configure.zcml
===
--- Zope/trunk/src/AccessControl/configure.zcml (rev 0)
+++ Zope/trunk/src/AccessControl/configure.zcml 2009-07-30 19:40:57 UTC (rev 
102392)
@@ -0,0 +1,5 @@
+http://namespaces.zope.org/zope";>
+
+  
+
+


Property changes on: Zope/trunk/src/AccessControl/configure.zcml
___
Added: svn:eol-style
   + native

Copied: Zope/trunk/src/AccessControl/permissions.zcml (from rev 102379, 
Zope/trunk/src/Products/Five/permissions.zcml)
===
--- Zope/trunk/src/AccessControl/permissions.zcml   
(rev 0)
+++ Zope/trunk/src/AccessControl/permissions.zcml   2009-07-30 19:40:57 UTC 
(rev 102392)
@@ -0,0 +1,104 @@
+http://namespaces.zope.org/zope";
+   i18n_domain="Zope2">
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+  
+
+

Modified: Zope/trunk/src/Products/Five/browser/tests/test_defaultview.py
===
--- Zope/trunk/src/Products/Five/browser/tests/test_defaultview.py  
2009-07-30 19:29:29 UTC (rev 102391)
+++ Zope/trunk/src/Products/Five/browser/tests/test_defaultview.py  
2009-07-30 19:40:57 UTC (rev 102392)
@@ -112,10 +112,11 @@
 
 First, we load the configuration file:
 
+  >>> import AccessControl
   >>> import Products.Five.tests
   >>> from Products.Five import zcml
   >>> zcml.load_config('meta.zcml', Products.Five)
-  >>> zcml.load_config("permissions.zcml", Products.Five)
+  >>> zcml.load_config("permissions.zcml", AccessControl)
   >>> zcml.load_config('directives.zcml', Products.Five.tests)
 
 Define a view, with a single attribute and the name of the view

Modified: Zope/trunk/src/Products/Five/browser/tests/test_menu.py
===
--- Zope/trunk/src/Products/Five/browser/tests/test_menu.py 2009-07-30 
19:29:29 UTC (rev 102391)
+++ Zope/trunk/src/Products/Five/browser/tests/test_menu.py 2009-07-30 
19:40:57 UTC (rev 102392)
@@ -23,10 +23,11 @@
 Before we can start we need to set up a few things.  For menu
 configuration, we have to start a new interaction:
 
+  >>> import AccessControl
   >>> import Products.Five.browser.tests
   >>> from Products.Five import zcml
   >>> zcml.load_config("meta.zcml", Products.Five)
-  >>> zcml.load_config("permissions.zcml", Products.Five)
+  >>> zcml.load_config("permissions.zcml", AccessControl)
   >>> zcml.load_config('menu.zcml', package=Products.Five.browser.tests)
 
   >>> from Products.Five.security import newInteraction

Modified: Zope/trunk/src/Products/Five/permissions.zcml

[Zope-Checkins] SVN: Zope/trunk/ Moved ``Products/Five/publisher.zcml`` into the ZPublisher package.

2009-07-30 Thread Hanno Schlichting
Log message for revision 102391:
  Moved ``Products/Five/publisher.zcml`` into the ZPublisher package.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Products/Five/configure.zcml
  U   Zope/trunk/src/Products/Five/publisher.zcml
  A   Zope/trunk/src/ZPublisher/configure.zcml
  A   Zope/trunk/src/ZPublisher/publisher.zcml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst  2009-07-30 19:19:53 UTC (rev 102390)
+++ Zope/trunk/doc/CHANGES.rst  2009-07-30 19:29:29 UTC (rev 102391)
@@ -11,6 +11,8 @@
 Restructuring
 +
 
+- Moved ``Products/Five/publisher.zcml`` into the ZPublisher package.
+
 - Moved ``Products/Five/event.zcml`` into the OFS package.
 
 - Removed no longer maintained ``configure, make, make install`` related

Modified: Zope/trunk/src/Products/Five/configure.zcml
===
--- Zope/trunk/src/Products/Five/configure.zcml 2009-07-30 19:19:53 UTC (rev 
102390)
+++ Zope/trunk/src/Products/Five/configure.zcml 2009-07-30 19:29:29 UTC (rev 
102391)
@@ -5,10 +5,10 @@
   
   
   
-  
   
 
   
+  
 
   
   

Modified: Zope/trunk/src/Products/Five/publisher.zcml
===
--- Zope/trunk/src/Products/Five/publisher.zcml 2009-07-30 19:19:53 UTC (rev 
102390)
+++ Zope/trunk/src/Products/Five/publisher.zcml 2009-07-30 19:29:29 UTC (rev 
102391)
@@ -1,23 +1,5 @@
 http://namespaces.zope.org/zope";>
 
-  
+  
 
-  
-
-  
-
-  
-
-  
-
 

Added: Zope/trunk/src/ZPublisher/configure.zcml
===
--- Zope/trunk/src/ZPublisher/configure.zcml(rev 0)
+++ Zope/trunk/src/ZPublisher/configure.zcml2009-07-30 19:29:29 UTC (rev 
102391)
@@ -0,0 +1,5 @@
+http://namespaces.zope.org/zope";>
+
+  
+
+


Property changes on: Zope/trunk/src/ZPublisher/configure.zcml
___
Added: svn:eol-style
   + native

Copied: Zope/trunk/src/ZPublisher/publisher.zcml (from rev 102379, 
Zope/trunk/src/Products/Five/publisher.zcml)
===
--- Zope/trunk/src/ZPublisher/publisher.zcml(rev 0)
+++ Zope/trunk/src/ZPublisher/publisher.zcml2009-07-30 19:29:29 UTC (rev 
102391)
@@ -0,0 +1,23 @@
+http://namespaces.zope.org/zope";>
+
+  
+
+  
+
+  
+
+  
+
+  
+
+

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Moved ``Products/Five/event.zcml`` into the OFS package.

2009-07-30 Thread Hanno Schlichting
Log message for revision 102390:
  Moved ``Products/Five/event.zcml`` into the OFS package.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  A   Zope/trunk/src/OFS/configure.zcml
  A   Zope/trunk/src/OFS/event.zcml
  U   Zope/trunk/src/OFS/tests/testObjectManager.py
  U   Zope/trunk/src/Products/Five/configure.zcml
  U   Zope/trunk/src/Products/Five/event.zcml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst  2009-07-30 19:14:18 UTC (rev 102389)
+++ Zope/trunk/doc/CHANGES.rst  2009-07-30 19:19:53 UTC (rev 102390)
@@ -11,6 +11,8 @@
 Restructuring
 +
 
+- Moved ``Products/Five/event.zcml`` into the OFS package.
+
 - Removed no longer maintained ``configure, make, make install`` related
   installation files. Zope2 can only be installed via its setup.py.
 

Added: Zope/trunk/src/OFS/configure.zcml
===
--- Zope/trunk/src/OFS/configure.zcml   (rev 0)
+++ Zope/trunk/src/OFS/configure.zcml   2009-07-30 19:19:53 UTC (rev 102390)
@@ -0,0 +1,5 @@
+http://namespaces.zope.org/zope";>
+
+  
+
+


Property changes on: Zope/trunk/src/OFS/configure.zcml
___
Added: svn:eol-style
   + native

Copied: Zope/trunk/src/OFS/event.zcml (from rev 102379, 
Zope/trunk/src/Products/Five/event.zcml)
===
--- Zope/trunk/src/OFS/event.zcml   (rev 0)
+++ Zope/trunk/src/OFS/event.zcml   2009-07-30 19:19:53 UTC (rev 102390)
@@ -0,0 +1,22 @@
+http://namespaces.zope.org/zope";>
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+

Modified: Zope/trunk/src/OFS/tests/testObjectManager.py
===
--- Zope/trunk/src/OFS/tests/testObjectManager.py   2009-07-30 19:14:18 UTC 
(rev 102389)
+++ Zope/trunk/src/OFS/tests/testObjectManager.py   2009-07-30 19:19:53 UTC 
(rev 102390)
@@ -74,7 +74,8 @@
 super(ObjectManagerTests, self).setUp()
 self.saved_cfg_debug_mode = getConfiguration().debug_mode
 zcml.load_config('meta.zcml', Products.Five)
-zcml.load_config('event.zcml', Products.Five)
+import OFS
+zcml.load_config('event.zcml', OFS)
 zcml.load_config('deprecated.zcml', Products.Five)
 setDeprecatedManageAddDelete(ItemForDeletion)
 

Modified: Zope/trunk/src/Products/Five/configure.zcml
===
--- Zope/trunk/src/Products/Five/configure.zcml 2009-07-30 19:14:18 UTC (rev 
102389)
+++ Zope/trunk/src/Products/Five/configure.zcml 2009-07-30 19:19:53 UTC (rev 
102390)
@@ -4,10 +4,12 @@
   
   
   
-  
   
   
   
+
+  
+
   
   
   

Modified: Zope/trunk/src/Products/Five/event.zcml
===
--- Zope/trunk/src/Products/Five/event.zcml 2009-07-30 19:14:18 UTC (rev 
102389)
+++ Zope/trunk/src/Products/Five/event.zcml 2009-07-30 19:19:53 UTC (rev 
102390)
@@ -1,22 +1,5 @@
 http://namespaces.zope.org/zope";>
 
-  
-  
+  
 
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/src/Products/ZReST/ Found two more stray build files

2009-07-30 Thread Hanno Schlichting
Log message for revision 102386:
  Found two more stray build files
  

Changed:
  D   Zope/trunk/src/Products/ZReST/Makefile
  D   Zope/trunk/src/Products/ZReST/refresh.txt

-=-
Deleted: Zope/trunk/src/Products/ZReST/Makefile
===
--- Zope/trunk/src/Products/ZReST/Makefile  2009-07-30 18:57:22 UTC (rev 
102385)
+++ Zope/trunk/src/Products/ZReST/Makefile  2009-07-30 19:02:26 UTC (rev 
102386)
@@ -1,15 +0,0 @@
-FILES = ZReST.py __init__.py refresh.txt version.txt TODO.txt README.txt
-DTML = dtml/manage_addZReSTForm.dtml dtml/manage_editForm.dtml
-VERSION := $(shell cat version.txt)
-
-all: ${FILES} ${DTML}
-   rm -rf dist
-   mkdir dist
-   mkdir dist/ZReST
-   mkdir dist/ZReST/dtml
-   cp ${FILES} dist/ZReST
-   cp ${DTML}  dist/ZReST/dtml
-   (cd dist; tar zcf ZReST-${VERSION}.tgz ZReST)
-   mv dist/ZReST-${VERSION}.tgz .
-   rm -rf dist
-

Deleted: Zope/trunk/src/Products/ZReST/refresh.txt
===
--- Zope/trunk/src/Products/ZReST/refresh.txt   2009-07-30 18:57:22 UTC (rev 
102385)
+++ Zope/trunk/src/Products/ZReST/refresh.txt   2009-07-30 19:02:26 UTC (rev 
102386)
@@ -1 +0,0 @@
-This is a flag that tells Zope that the product may be auto-refreshed.

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/src/ Removed no longer used setup and distribution files

2009-07-30 Thread Hanno Schlichting
Log message for revision 102385:
  Removed no longer used setup and distribution files
  

Changed:
  D   Zope/trunk/src/AccessControl/DEPENDENCIES.cfg
  D   Zope/trunk/src/AccessControl/SETUP.cfg
  D   Zope/trunk/src/DocumentTemplate/DEPENDENCIES.cfg
  D   Zope/trunk/src/DocumentTemplate/SETUP.cfg
  D   Zope/trunk/src/DocumentTemplate/release.fl
  D   Zope/trunk/src/DocumentTemplate/release.sh
  D   Zope/trunk/src/Missing/DEPENDENCIES.cfg
  D   Zope/trunk/src/Missing/SETUP.cfg
  D   Zope/trunk/src/Missing/setup.py
  D   Zope/trunk/src/MultiMapping/DEPENDENCIES.cfg
  D   Zope/trunk/src/MultiMapping/SETUP.cfg
  D   Zope/trunk/src/MultiMapping/setup.py
  D   Zope/trunk/src/Record/DEPENDENCIES.cfg
  D   Zope/trunk/src/Record/SETUP.cfg
  D   Zope/trunk/src/Record/setup.py
  D   Zope/trunk/src/ThreadLock/SETUP.cfg
  D   Zope/trunk/src/ThreadLock/setup.py
  D   Zope/trunk/src/initgroups/SETUP.cfg

-=-
Deleted: Zope/trunk/src/AccessControl/DEPENDENCIES.cfg
===
--- Zope/trunk/src/AccessControl/DEPENDENCIES.cfg   2009-07-30 18:50:30 UTC 
(rev 102384)
+++ Zope/trunk/src/AccessControl/DEPENDENCIES.cfg   2009-07-30 18:57:22 UTC 
(rev 102385)
@@ -1,2 +0,0 @@
-ExtensionClass
-Acquisition

Deleted: Zope/trunk/src/AccessControl/SETUP.cfg
===
--- Zope/trunk/src/AccessControl/SETUP.cfg  2009-07-30 18:50:30 UTC (rev 
102384)
+++ Zope/trunk/src/AccessControl/SETUP.cfg  2009-07-30 18:57:22 UTC (rev 
102385)
@@ -1,3 +0,0 @@
-
-  source cAccessControl.c
-

Deleted: Zope/trunk/src/DocumentTemplate/DEPENDENCIES.cfg
===
--- Zope/trunk/src/DocumentTemplate/DEPENDENCIES.cfg2009-07-30 18:50:30 UTC 
(rev 102384)
+++ Zope/trunk/src/DocumentTemplate/DEPENDENCIES.cfg2009-07-30 18:57:22 UTC 
(rev 102385)
@@ -1 +0,0 @@
-ExtensionClass

Deleted: Zope/trunk/src/DocumentTemplate/SETUP.cfg
===
--- Zope/trunk/src/DocumentTemplate/SETUP.cfg   2009-07-30 18:50:30 UTC (rev 
102384)
+++ Zope/trunk/src/DocumentTemplate/SETUP.cfg   2009-07-30 18:57:22 UTC (rev 
102385)
@@ -1,3 +0,0 @@
-
-  source cDocumentTemplate.c
-

Deleted: Zope/trunk/src/DocumentTemplate/release.fl
===
--- Zope/trunk/src/DocumentTemplate/release.fl  2009-07-30 18:50:30 UTC (rev 
102384)
+++ Zope/trunk/src/DocumentTemplate/release.fl  2009-07-30 18:57:22 UTC (rev 
102385)
@@ -1,20 +0,0 @@
-DT_HTML.py
-DT_If.py
-DT_In.py
-DT_String.py
-DT_UI.py
-DT_Util.py
-DT_Var.py
-DT_Raise.py
-DTtest.py
-DTtestExpr.py
-DTtest_basicIn.py
-DocumentTemplate.py
-VSEval.py
-__init__.py
-pDocumentTemplate.py
-release_notes
-gparse.py
-DT_With.py
-DT_InSV.py
-ts_regex.py

Deleted: Zope/trunk/src/DocumentTemplate/release.sh
===
--- Zope/trunk/src/DocumentTemplate/release.sh  2009-07-30 18:50:30 UTC (rev 
102384)
+++ Zope/trunk/src/DocumentTemplate/release.sh  2009-07-30 18:57:22 UTC (rev 
102385)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-R=$1
-M=DocumentTemplate
-
-# StructuredText < $M.stx > $M.html
-StructuredText -t < release_notes > DocumentTemplate-rn.html
-cp DocumentTemplate-rn.html ..
-rm -rf "$M-$R"
-mkdir  "$M-$R" "$M-$R/$M"
-echo
-for f in `cat pyfiles`; do
-  python1.5 -c "import sys; sys.path.append('..'); from tabnanny import *; 
f='$f'; check(f)"
-done 
-echo
-tar -c -T release.fl -f - | (cd "$M-$R/$M"; tar xvf -)
-cp INSTALL "$M-$R"/
-tar cvf "$M-$R.tar" "$M-$R"
-rm -f "$M-$R.tar.gz"
-gzip "$M-$R.tar"

Deleted: Zope/trunk/src/Missing/DEPENDENCIES.cfg
===
--- Zope/trunk/src/Missing/DEPENDENCIES.cfg 2009-07-30 18:50:30 UTC (rev 
102384)
+++ Zope/trunk/src/Missing/DEPENDENCIES.cfg 2009-07-30 18:57:22 UTC (rev 
102385)
@@ -1 +0,0 @@
-ExtensionClass

Deleted: Zope/trunk/src/Missing/SETUP.cfg
===
--- Zope/trunk/src/Missing/SETUP.cfg2009-07-30 18:50:30 UTC (rev 102384)
+++ Zope/trunk/src/Missing/SETUP.cfg2009-07-30 18:57:22 UTC (rev 102385)
@@ -1,3 +0,0 @@
-
-  source _Missing.c
-

Deleted: Zope/trunk/src/Missing/setup.py
===
--- Zope/trunk/src/Missing/setup.py 2009-07-30 18:50:30 UTC (rev 102384)
+++ Zope/trunk/src/Missing/setup.py 2009-07-30 18:57:22 UTC (rev 102385)
@@ -1,22 +0,0 @@
-##
-#
-# Copyright (c) 2003 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLA

[Zope-Checkins] SVN: Zope/trunk/setup.py Acquisition is omnipresent, but there's still a difference to the Zope2 egg ; )

2009-07-30 Thread Hanno Schlichting
Log message for revision 102383:
  Acquisition is omnipresent, but there's still a difference to the Zope2 egg ;)
  

Changed:
  U   Zope/trunk/setup.py

-=-
Modified: Zope/trunk/setup.py
===
--- Zope/trunk/setup.py 2009-07-30 18:31:36 UTC (rev 102382)
+++ Zope/trunk/setup.py 2009-07-30 18:41:54 UTC (rev 102383)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##
-"""Setup for the Acquisition egg package
+"""Setup for the Zope2 package
 """
 import os
 from setuptools import setup, find_packages, Extension

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Removed no longer maintained ``configure, make, make install`` related installation files. Zope2 can only be installed via its setup.py.

2009-07-30 Thread Hanno Schlichting
Log message for revision 102382:
  Removed no longer maintained ``configure, make, make install`` related 
installation files. Zope2 can only be installed via its setup.py.
  

Changed:
  D   Zope/trunk/configure
  U   Zope/trunk/doc/CHANGES.rst
  D   Zope/trunk/inst/Makefile.in
  D   Zope/trunk/inst/Makefile.win.in
  D   Zope/trunk/inst/WinBuilders/
  D   Zope/trunk/inst/compilezpy.py
  D   Zope/trunk/inst/configure.py
  D   Zope/trunk/inst/file_from_infile.py
  D   Zope/trunk/inst/install.py
  D   Zope/trunk/inst/make_resource.py
  D   Zope/trunk/inst/tar.py
  D   Zope/trunk/inst/versions.py
  D   Zope/trunk/inst/walkandscrub.py

-=-
Deleted: Zope/trunk/configure
===
--- Zope/trunk/configure2009-07-30 18:30:52 UTC (rev 102381)
+++ Zope/trunk/configure2009-07-30 18:31:36 UTC (rev 102382)
@@ -1,206 +0,0 @@
-#!/bin/sh
-
-# Zope configure script
-# $Id$
-
-#
-#BEGIN EDITABLE PARAMETERS  #
-#
-
-# Place the optimal target version number for Zope (as returned by sys.version)
-# below
-TARGET="2.5.4"
-
-# Order a list of "acceptable" python version numbers (as returned by
-# sys.version) below in "best" to "worst" order, not including the
-# target version.  Up to six acceptable python versions are allowed.
-# Do not include the target version number in this list!
-ACCEPTABLE="2.6.1"
-
-# provide the executable names for all the acceptable versions
-# (and the target version) below
-EXENAMES="python python2 python2.5 python2.6"
-
-#
-#END EDITABLE PARAMETERS#
-#
-
-# where are we?
-HERE=`dirname $0`
-
-# should we be quiet?
-QUIET=""
-
-usage()
-{
-echo
-echo "configure [--help] [--quiet] [--with-python=path] [--prefix=path] "
-echo "  [--build-base=path] [--ignore-largefile] [--ignore-zlib]"
-echo "  [--optimize]"
-echo
-echo " Creates a Makefile suitable for building and installing Zope"
-echo
-echo " Options: "
-echo "  --help  shows usage and quits"
-echo "  --quiet suppress nonessential output"
-echo "  --with-python   specify a path to a Python interpreter to use"
-echo "  --prefixspecify an installation path for binary data"
-echo "  --build-basespecify a temporary path for build files"
-echo "  --ignore-largefile  ignore large file support warnings"
-echo "  --ignore-expat  ignore warnings about expat/pyexpat"
-echo "  --ignore-zlib   ignore warnings about zlib"
-echo "  --optimize  optimize compiled Python bytecode"
-echo "  --no-compileDont compile Python bytecode"
-echo
-echo " Given no options, configure will search your PATH for a suitable"
-echo " Python interpreter and will use '/opt/Zope-'"
-echo " as a prefix."
-echo
-}
-
-# bootstrap ourselves by finding a Python interpreter if necessary
-get_python() {
-OLDIFS="$IFS"
-IFS=":"
-FOUND=""
-VERSION=""
-FOUNDLIST=""
-out "Testing for an acceptable Python interpreter..."
-out ""
-for DIR in $PATH; do
-IFS="$OLDIFS"
-for EXECUTABLE in $EXENAMES; do
-FULL="$DIR/$EXECUTABLE"
-if [ -x "$FULL" -a ! -d "$FULL" ]; then
-CMD="import string,sys;a=string.split(sys.version)[0]"
-   # Strip trailing + from version number
-   CMD="$CMD;a=(a[-1]=='+')and(a[:-1])or(a);print a"
-VERSION=`"$FULL" -c "$CMD"`
-out "  Python version $VERSION found at $FULL"
-if [ "$VERSION" = "$TARGET" ]; then
-FOUND="$FULL"
-FOUNDVERSION=$VERSION
-break 2
-else
-i=1;
-for ACC in $ACCEPTABLE; do
-i=`expr $i + 1`
-   for SLOT in $FOUNDLIST; do
-if [ $SLOT -eq $i ]; then
-# slot "i" already populated.  This means we've
-# already found this particular version of
-# python.  Continue the for ACC in 
-# $ACCEPTABLE loop and don't overwrite the
-# one we already found (interpreters first
-# on the path win).
-continue 2
-fi
-done
-if [ "$VERSION" = "$ACC" ]; then
-FOUNDLIST="$FOUNDLIST $i"
-eval

[Zope-Checkins] SVN: Zope/trunk/alltests.cfg zLOG got integrated back in - no need to download and test the extra distribution

2009-07-30 Thread Hanno Schlichting
Log message for revision 102380:
  zLOG got integrated back in - no need to download and test the extra 
distribution
  

Changed:
  U   Zope/trunk/alltests.cfg

-=-
Modified: Zope/trunk/alltests.cfg
===
--- Zope/trunk/alltests.cfg 2009-07-30 16:41:59 UTC (rev 102379)
+++ Zope/trunk/alltests.cfg 2009-07-30 18:19:19 UTC (rev 102380)
@@ -15,7 +15,6 @@
 Persistence
 RestrictedPython
 tempstorage
-zLOG
 zope.annotation
 zope.authentication
 zope.broken

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins