Log message for revision 115061:
  Revert the OFSP refactoring and no longer register OFS as a package.
  

Changed:
  U   Zope/trunk/buildout.cfg
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/OFS/Application.py
  U   Zope/trunk/src/OFS/__init__.py
  U   Zope/trunk/src/OFS/configure.zcml
  U   Zope/trunk/src/OFS/tests/testAppInitializer.py
  U   Zope/trunk/src/Products/Five/component/makesite.txt
  U   Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py
  U   Zope/trunk/src/Testing/ZopeTestCase/doc/TIMELINES.txt

-=-
Modified: Zope/trunk/buildout.cfg
===================================================================
--- Zope/trunk/buildout.cfg     2010-07-25 09:48:53 UTC (rev 115060)
+++ Zope/trunk/buildout.cfg     2010-07-25 09:50:09 UTC (rev 115061)
@@ -18,6 +18,7 @@
     wsgi
 sources-dir = develop
 auto-checkout =
+    Products.OFSP
 
 
 [test]
@@ -52,6 +53,7 @@
     Products.BTreeFolder2
     Products.ExternalMethod
     Products.MailHost
+    Products.OFSP
     Products.PythonScripts
     Products.StandardCacheManagers
     Products.ZCTextIndex

Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst  2010-07-25 09:48:53 UTC (rev 115060)
+++ Zope/trunk/doc/CHANGES.rst  2010-07-25 09:50:09 UTC (rev 115061)
@@ -82,12 +82,6 @@
 
 - No longer use HelpSys pages from ``Products.OFSP`` in core Zope 2.
 
-- Register OFS as a package and give it an initialize function. Moved
-  registration of OFS classes there from Products.OFSP. ZopeTestCase will no
-  longer install the OFSP product automatically, so you might need to change
-  your test layer setup to load the OFS configure.zcml and call
-  installPackage('OFS').
-
 - No longer create an `Extensions` folder in the standard instance skeleton.
   External methods will become entirely optional in Zope 2.14.
 

Modified: Zope/trunk/src/OFS/Application.py
===================================================================
--- Zope/trunk/src/OFS/Application.py   2010-07-25 09:48:53 UTC (rev 115060)
+++ Zope/trunk/src/OFS/Application.py   2010-07-25 09:50:09 UTC (rev 115061)
@@ -756,7 +756,7 @@
             if hasattr(app, base):
                 continue
             ob = DTMLFile(base, std_dir)
-            app.manage_addProduct['OFS'].manage_addDTMLMethod(
+            app.manage_addProduct['OFSP'].manage_addDTMLMethod(
                 id=base, file=open(ob.raw))
         elif ext in ('.pt', '.zpt'):
             if hasattr(app, base):
@@ -767,7 +767,7 @@
         elif ext in ('.ico', '.gif', '.png'):
             if hasattr(app, fn):
                 continue
-            app.manage_addProduct['OFS'].manage_addImage(
+            app.manage_addProduct['OFSP'].manage_addImage(
                 id=fn, title='', file=open(os.path.join(std_dir, fn)))
         else:
             continue

Modified: Zope/trunk/src/OFS/__init__.py
===================================================================
--- Zope/trunk/src/OFS/__init__.py      2010-07-25 09:48:53 UTC (rev 115060)
+++ Zope/trunk/src/OFS/__init__.py      2010-07-25 09:50:09 UTC (rev 115061)
@@ -10,73 +10,3 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-
-
-def initialize(context):
-    from AccessControl.Permissions import add_documents_images_and_files
-    from AccessControl.Permissions import add_folders
-
-    import OFS.Image, OFS.Folder, OFS.userfolder
-    import OFS.DTMLMethod, OFS.DTMLDocument, OFS.PropertySheets
-    import OFS.OrderedFolder
-
-    context.registerClass(
-        OFS.DTMLMethod.DTMLMethod,
-        permission=add_documents_images_and_files,
-        constructors=(OFS.DTMLMethod.addForm, OFS.DTMLMethod.addDTMLMethod,),
-        icon='dtmlmethod.gif',
-        legacy=(
-            ('manage_addDocument', OFS.DTMLMethod.addDTMLMethod),
-            ('manage_addDTMLMethod', OFS.DTMLMethod.addDTMLMethod),
-        ))
-
-    context.registerClass(
-        OFS.DTMLDocument.DTMLDocument,
-        permission=add_documents_images_and_files,
-        constructors=(OFS.DTMLDocument.addForm,
-                      OFS.DTMLDocument.addDTMLDocument),
-        icon='dtmldoc.gif',
-        legacy=(('manage_addDTMLDocument', OFS.DTMLDocument.addDTMLDocument),
-        ))
-
-    context.registerClass(
-        OFS.Image.Image,
-        permission=add_documents_images_and_files,
-        constructors=(('imageAdd',OFS.Image.manage_addImageForm),
-                      OFS.Image.manage_addImage),
-        icon='Image_icon.gif',
-        legacy=(OFS.Image.manage_addImage,),
-        )
-
-    context.registerClass(
-        OFS.Image.File,
-        permission=add_documents_images_and_files,
-        constructors=(('fileAdd',OFS.Image.manage_addFileForm),
-                      OFS.Image.manage_addFile),
-        icon='File_icon.gif',
-        legacy=(OFS.Image.manage_addFile,),
-        )
-
-    context.registerClass(
-        OFS.Folder.Folder,
-        constructors=(OFS.Folder.manage_addFolderForm,
-                      OFS.Folder.manage_addFolder),
-        icon='Folder_icon.gif',
-        legacy=(OFS.Folder.manage_addFolder,),
-        )
-
-    context.registerClass(
-        OFS.OrderedFolder.OrderedFolder,
-        permission=add_folders,
-        constructors=(OFS.OrderedFolder.manage_addOrderedFolderForm,
-                      OFS.OrderedFolder.manage_addOrderedFolder),
-        icon='Folder_icon.gif',
-        legacy=(OFS.OrderedFolder.manage_addOrderedFolder,),
-        )
-
-    context.registerClass(
-        OFS.userfolder.UserFolder,
-        constructors=(OFS.userfolder.manage_addUserFolder,),
-        icon='UserFolder_icon.gif',
-        legacy=(OFS.userfolder.manage_addUserFolder,),
-        )

Modified: Zope/trunk/src/OFS/configure.zcml
===================================================================
--- Zope/trunk/src/OFS/configure.zcml   2010-07-25 09:48:53 UTC (rev 115060)
+++ Zope/trunk/src/OFS/configure.zcml   2010-07-25 09:50:09 UTC (rev 115061)
@@ -1,12 +1,7 @@
 <configure
-    xmlns="http://namespaces.zope.org/zope";
-    xmlns:five="http://namespaces.zope.org/five";>
+    xmlns="http://namespaces.zope.org/zope";>
 
   <include file="deprecated.zcml"/>
   <include file="event.zcml"/>
 
-  <five:registerPackage
-    package="OFS"
-    initialize="OFS.initialize" />
-
 </configure>

Modified: Zope/trunk/src/OFS/tests/testAppInitializer.py
===================================================================
--- Zope/trunk/src/OFS/tests/testAppInitializer.py      2010-07-25 09:48:53 UTC 
(rev 115060)
+++ Zope/trunk/src/OFS/tests/testAppInitializer.py      2010-07-25 09:50:09 UTC 
(rev 115061)
@@ -202,7 +202,7 @@
         self.configure(good_cfg)
         i = self.getOne()
         i.install_products()
-        self.failUnless(Application.misc_.__dict__.has_key('OFS'))
+        self.failUnless(Application.misc_.__dict__.has_key('OFSP'))
 
     def test_install_standards(self):
         self.configure(good_cfg)

Modified: Zope/trunk/src/Products/Five/component/makesite.txt
===================================================================
--- Zope/trunk/src/Products/Five/component/makesite.txt 2010-07-25 09:48:53 UTC 
(rev 115060)
+++ Zope/trunk/src/Products/Five/component/makesite.txt 2010-07-25 09:50:09 UTC 
(rev 115061)
@@ -36,7 +36,7 @@
 
 Let's add a folder:
 
-    >>> browser.open('http://localhost/manage_addProduct/OFS/folderAdd')
+    >>> browser.open('http://localhost/manage_addProduct/OFSP/folderAdd')
     >>> browser.getControl(name='id').value = 'folder'
     >>> browser.getControl('Add').click()
     >>> browser.getLink('folder').click()

Modified: Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py
===================================================================
--- Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py     2010-07-25 09:48:53 UTC 
(rev 115060)
+++ Zope/trunk/src/Testing/ZopeTestCase/ZopeLite.py     2010-07-25 09:50:09 UTC 
(rev 115061)
@@ -218,6 +218,7 @@
             if not quiet: _print('Installing %s ... NOT FOUND\n' % name)
 
 installProduct('PluginIndexes', 1)  # Must install first
+installProduct('OFSP', 1)
 
 # So people can use ZopeLite.app()
 app = Zope2.app

Modified: Zope/trunk/src/Testing/ZopeTestCase/doc/TIMELINES.txt
===================================================================
--- Zope/trunk/src/Testing/ZopeTestCase/doc/TIMELINES.txt       2010-07-25 
09:48:53 UTC (rev 115060)
+++ Zope/trunk/src/Testing/ZopeTestCase/doc/TIMELINES.txt       2010-07-25 
09:50:09 UTC (rev 115061)
@@ -27,7 +27,7 @@
             2.1.5 imports module Zope
             2.1.6 starts Zope
             2.1.7 installs product PluginIndexes
-            2.1.8 installs package OFS
+            2.1.8 installs product OFSP
 
         2.2 imports module Testing.ZopeTestCase.ZopeTestCase
 

_______________________________________________
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

Reply via email to