[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.49

[Jens Vagelpohl]

Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv1214/Extensions

Modified Files:
	setupZopeOrg.py 
Log Message:
- removed CMFBTreeFolder, you *must* now install the
  BTreeFolder2 prodct from the repository instead


=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.48 => 1.49 ===
 from Products.DateIndexes.DateRangeIndex import DateRangeIndex
 from Products.CMFDateIndexes.RSCatalogTool import RSCatalogTool
-from Products.BTreeFolder.BTreeFolder import manage_addBTreeFolder
+from Products.BTreeFolder2.CMFBTreeFolder import manage_addCMFBTreeFolder
 
 #
 # List all specially initialized components
@@ -44,7 +44,7 @@
                   , 'ZopeOrg'
                   , 'PageTemplates'
                   , 'Rewriter'
-                  , 'BTreeFolder'
+                  , 'BTreeFolder2'
                   , 'PythonJobs'
                   , 'DateIndexes'
                   )
@@ -217,7 +217,11 @@
 
     # Create a Members BTreeFolder
     log.append('\n * Creating a Members BTreeFolder')
-    manage_addBTreeFolder( portal, 'Members', 'Member Folder' )
+    
+    if ( 'Members' in portal.objectIds() and 
+         getattr( portal, 'Members' ).meta_type == 'Folder' ):
+        portal._delObject( 'Members' )
+        manage_addCMFBTreeFolder( portal, 'Members', 'Member Folder' )
 
     # Setting up other external methods for conversion and synchronization
     log.append('\n * Setting up external methods')
@@ -289,7 +293,7 @@
 
     # The roster shit is dangerous. we remove it here.
     mem_folder = getattr( portal, 'Members' )
-    if 'index_html' in mem_folder.objectids():
+    if 'index_html' in mem_folder.objectIds():
         mem_folder._delObject('index_html')
         log.append('\n * Removing membership roster')