[zopeorg-checkins] CVS: Products/ZopeOrg-NV - __init__.py:1.16

[Sidnei da Silva]

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

Modified Files:
	__init__.py 
Log Message:
Some cleanup to remove LDAP dependencies. We will use ZEUM, not CMFLDAP

=== Products/ZopeOrg-NV/__init__.py 1.15 => 1.16 ===
 import SoftwareProduct
 import NewsItemWorkflow
 import ZopeOrgWorkflow
-import ZopeOrgMemberDataTool
-import ZopeOrgMembershipTool
+#import ZopeOrgMemberDataTool
+#import ZopeOrgMembershipTool
 import ContentList
-from Products.BTreeFolder2 import CMFBTreeFolder
+import Acquisition
+
+#Hackish workaround to allow accesing the broken ZODB on ZopeOrg
+class ImplicitAcquirerWrapper:
+    pass
+
+Acquisition.ImplicitAcquirerWrapper = ImplicitAcquirerWrapper
 
 zopeorg_globals = globals()
 
@@ -17,7 +23,7 @@
 registerDirectory('skins/zopeorg', globals())
 registerDirectory('skins/zopeorg_membership', globals())
 
-ftis = SoftwareProduct.factory_type_information + CMFBTreeFolder.factory_type_information
+ftis = SoftwareProduct.factory_type_information
 
 CL_CTORS = ( ( 'manage_addContentListForm', ContentList.addContentListForm )
            , ContentList.addContentList
@@ -40,25 +46,23 @@
                          , permission='Manage portal'
                          )
 
-    ToolInit(
-        'Zope.Org Tools',
-        tools = ( ZopeOrgMemberDataTool.ZopeOrgMemberDataTool
-                , ZopeOrgMembershipTool.ZopeOrgMembershipTool
-                ),
-        product_name='ZopeOrg',
-        icon='tool.gif' ).initialize( context )
+    #ToolInit(
+    #    'Zope.Org Tools',
+    #    tools = ( ZopeOrgMemberDataTool.ZopeOrgMemberDataTool
+    #            , ZopeOrgMembershipTool.ZopeOrgMembershipTool
+    #            ),
+    #    product_name='ZopeOrg',
+    #    icon='tool.gif' ).initialize( context )
 
     ContentInit(
         'Zope.org Content',
         content_types = ( SoftwareProduct.SoftwareProduct
                         , SoftwareProduct.SoftwareRelease
-                        , CMFBTreeFolder.CMFBTreeFolder
                         ),
         permission = AddPortalContent,
         extra_constructors = ( SoftwareProduct.addSoftwareProduct
                              , SoftwareProduct.addSoftwareRelease
                              , SoftwareProduct.addSoftwareReleaseFile
-                             , CMFBTreeFolder.manage_addCMFBTreeFolder
                              ),
         fti = ftis ,
         ).initialize(context)