[zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.54 setupZopeOrgMembership.py:1.16
Sidnei da Silva
sidnei at x3ng.com.br
Mon Dec 2 18:00:08 EST 2002
Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions
In directory cvs.zope.org:/tmp/cvs-serv28729/Extensions
Modified Files:
setupZopeOrg.py setupZopeOrgMembership.py
Log Message:
Some cleanup to remove LDAP dependencies. We will use ZEUM, not CMFLDAP
=== Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.53 => 1.54 ===
# List all specially initialized components
########################################################
-INVISIBLE_TYPES = ( 'CMF Wiki Page'
+INVISIBLE_TYPES = ( 'Wiki Page'
, 'Software Release'
, 'Software Release File'
)
@@ -37,20 +37,21 @@
NEEDED_PRODUCTS = ( 'CMFDefault'
, 'CMFCore'
, 'CMFWiki'
- , 'CMFLDAP'
- , 'LDAPUserFolder'
+ , 'ZWiki'
+ , 'BackTalk'
+ , 'CMFBackTalk'
+ , 'DCWorkflow'
, 'ZopeOrg'
, 'PageTemplates'
, 'Rewriter'
, 'BTreeFolder2'
- , 'DateIndexes'
)
SKINPATHS = ( 'Basic', )
-SKINS = ( 'zopeorg_membership'
- , 'software_product'
+SKINS = ( 'software_product'
, 'zpt_membership'
, 'zopeorg'
+ , 'nzo'
)
ADD_INDEXES = ()
@@ -76,9 +77,9 @@
, 'module' : 'ZopeOrg.synchronizeSkeleton'
, 'function' : 'synchronize'
}
- , { 'id' : 'ZO_setupCMFWiki'
- , 'title' : 'Set up CMFWiki product'
- , 'module' : 'CMFWiki.Install'
+ , { 'id' : 'ZO_setupZWiki'
+ , 'title' : 'Set up ZWiki product'
+ , 'module' : 'ZWiki.cmf_install_zwiki'
, 'function' : 'install'
}
, { 'id' : 'localattr'
@@ -96,6 +97,11 @@
, 'module': 'CMFCalendar.Install'
, 'function' : 'install'
}
+ , { 'id' : 'installCMFBackTalk'
+ , 'title' : 'Setup CMFBackTalk Product'
+ , 'module': 'CMFBackTalk.Install'
+ , 'function' : 'install'
+ }
, { 'id' : 'ZPT_skip_unauthorized'
, 'title' : 'ZPT_skip_unauthorized'
, 'module' : 'ZopeOrg.ZPT_skip_unauthorized'
@@ -247,8 +253,8 @@
log.append( log_line )
# Run the CMFWiki install script
- log.append( '\n * Executing the CMFWiki install script' )
- log_str = portal.ZO_setupCMFWiki()
+ log.append( '\n * Executing the ZWiki install script' )
+ log_str = portal.ZO_setupZWiki()
log_list = string.split( log_str, '\n' )
for i in range( len( log_list ) ):
log_list[i] = ' - %s' % log_list[i]
@@ -262,8 +268,16 @@
log_list[1] = ' - %s' % log_list[i]
log.extend(log_list)
+ # Run the CMFBackTalk install script
+ log.append('\n * Executing CMFBackTalk install script')
+ log_str = portal.installCMFBackTalk()
+ log_list = string.split(log_str, '\n')
+ for i in range(len(log_list)):
+ log_list[1] = ' - %s' % log_list[i]
+ log.extend(log_list)
+
log.append('\n * Modifying allowed/filtered types for folderish types')
- folderish_types=['CMF Wiki', 'Software Product',
+ folderish_types=['Wiki Folder', 'Software Product',
'Software Release', 'Member Folder']
setupAllowedTypes(portal, folderish_types)
=== Products/ZopeOrg-NV/Extensions/setupZopeOrgMembership.py 1.15 => 1.16 ===
#
import string, os
-from Products.LDAPUserFolder.LDAPUserFolder import manage_addLDAPUserFolder
+#from Products.LDAPUserFolder.LDAPUserFolder import manage_addLDAPUserFolder
from Products.ZopeOrg import zopeorg_globals
from Products.CMFCore.DirectoryView import addDirectoryViews
from Products.CMFCore.utils import getToolByName
-from Products.ZopeOrg.ZopeOrgMembershipTool import ZopeOrgMembershipTool
-from Products.ZopeOrg.ZopeOrgMembershipTool import manage_addZopeOrgMembershipTool
-from Products.ZopeOrg.ZopeOrgMemberDataTool import ZopeOrgMemberDataTool
-from Products.ZopeOrg.ZopeOrgMemberDataTool import manage_addZopeOrgMemberDataTool
+#from Products.ZopeOrg.ZopeOrgMembershipTool import ZopeOrgMembershipTool
+#from Products.ZopeOrg.ZopeOrgMembershipTool import manage_addZopeOrgMembershipTool
+#from Products.ZopeOrg.ZopeOrgMemberDataTool import ZopeOrgMemberDataTool
+#from Products.ZopeOrg.ZopeOrgMemberDataTool import manage_addZopeOrgMemberDataTool
#
# List all specially initialized components
########################################################
-TOOL_CLASSES = (
- ('portal_membership', ZopeOrgMembershipTool),
- ('portal_memberdata', ZopeOrgMemberDataTool),
- )
-
-if os.environ.get('HOSTNAME', '') in ( 'faux.digicool.com'
- , 'waldorf'
- , 'zoc.zope.com'
- ):
- LDAP_SERVER = 'waldorf.zope.com'
-else:
- LDAP_SERVER = 'storage'
-
-LDAP_SCHEMA = [
- ('cn', 'Login Name'), ('sn', 'Last Name'),
- ('givenName', 'First Name'), ('mail', 'Email Address'),
- ('o', 'Organization'), ('public', 'Listed'),
- ('portalSkin', 'Portal Skin'), ('lastLogin', 'Last Login'),
- ('prevLogin', 'Previous Login'), ('startupPage', 'Start Page')
- ]
-
-LDAP_NAME_MAPPINGS = {
- 'mail':'email',
- 'cn':'full_name',
- 'portalSkin':'portal_skin'
- }
-
-LDAP_SETTINGS = { 'login_attr' : 'cn'
- , 'rdn_attr' : 'cn'
- , 'users_base' : 'ou=people,dc=zope,dc=org'
- , 'users_scope' : 2
- , 'groups_base' : 'ou=www.zope.org,ou=websites,ou=groups,dc=zope,dc=org'
- , 'groups_scope' : 2
- , 'bind_uid' : 'cn=Manager,dc=zope,dc=org'
- , 'bind_pwd' : '5ecret'
- , 'default_roles' : 'Anonymous'
- , 'use_cookies' : 0
- , 'objectClasses' : 'top,zopeOrgPerson'
- }
+# TOOL_CLASSES = (
+# ('portal_membership', ZopeOrgMembershipTool),
+# ('portal_memberdata', ZopeOrgMemberDataTool),
+# )
+
+# if os.environ.get('HOSTNAME', '') in ( 'faux.digicool.com'
+# , 'waldorf'
+# , 'zoc.zope.com'
+# ):
+# LDAP_SERVER = 'waldorf.zope.com'
+# else:
+# LDAP_SERVER = 'storage'
+
+# LDAP_SCHEMA = [
+# ('cn', 'Login Name'), ('sn', 'Last Name'),
+# ('givenName', 'First Name'), ('mail', 'Email Address'),
+# ('o', 'Organization'), ('public', 'Listed'),
+# ('portalSkin', 'Portal Skin'), ('lastLogin', 'Last Login'),
+# ('prevLogin', 'Previous Login'), ('startupPage', 'Start Page')
+# ]
+
+# LDAP_NAME_MAPPINGS = {
+# 'mail':'email',
+# 'cn':'full_name',
+# 'portalSkin':'portal_skin'
+# }
+
+# LDAP_SETTINGS = { 'login_attr' : 'cn'
+# , 'rdn_attr' : 'cn'
+# , 'users_base' : 'ou=people,dc=zope,dc=org'
+# , 'users_scope' : 2
+# , 'groups_base' : 'ou=www.zope.org,ou=websites,ou=groups,dc=zope,dc=org'
+# , 'groups_scope' : 2
+# , 'bind_uid' : 'cn=Manager,dc=zope,dc=org'
+# , 'bind_pwd' : '5ecret'
+# , 'default_roles' : 'Anonymous'
+# , 'use_cookies' : 0
+# , 'objectClasses' : 'top,zopeOrgPerson'
+# }
#
# Initialize the log
@@ -69,37 +69,41 @@
# the external method object to be instantiated and run in Zope
#########################################################
-def setupZopeOrgMembership( self ):
- """ The central conversion method """
- log.append('Starting LDAP Membership conversion\n')
-
- # Find the portal to be modified. It is assumed that the external method
- # is instantiated at the root of the portal.
- portal = self
- if portal.meta_type != 'CMF Site':
- return 'You are not running this method inside a CMF Portal Instance!'
- else:
- log.append('Found CMF Site') # at %s' % portal.absolute_url())
-
-
- # Instantiate tools that are not in the standard CMF site
- log.append('\n * Instantiating Tools in the portal:')
- for tool_tuple in TOOL_CLASSES:
- registerTool(portal, tool_tuple)
-
- # Making LDAP Schema mods to the LDAPUserManager and LDAPLoginAdapter
- log.append('\n * Modifying LDAP tools for our LDAP schema')
- modifyLDAPTools(portal)
-
- # Register the skins directories as Filesystem Directory View
- # in the skins tool (portal_skins)
- log.append('\n * Registering skins directories with the Skins Tool:')
- registerSkins(portal)
+# def setupZopeOrgMembership( self ):
+# """ The central conversion method """
+# log.append('Starting LDAP Membership conversion\n')
+
+# # Find the portal to be modified. It is assumed that the external method
+# # is instantiated at the root of the portal.
+# portal = self
+# if portal.meta_type != 'CMF Site':
+# return 'You are not running this method inside a CMF Portal Instance!'
+# else:
+# log.append('Found CMF Site') # at %s' % portal.absolute_url())
+
+
+# # Instantiate tools that are not in the standard CMF site
+# log.append('\n * Instantiating Tools in the portal:')
+# for tool_tuple in TOOL_CLASSES:
+# registerTool(portal, tool_tuple)
+
+# # Making LDAP Schema mods to the LDAPUserManager and LDAPLoginAdapter
+# log.append('\n * Modifying LDAP tools for our LDAP schema')
+# modifyLDAPTools(portal)
+
+# # Register the skins directories as Filesystem Directory View
+# # in the skins tool (portal_skins)
+# log.append('\n * Registering skins directories with the Skins Tool:')
+# registerSkins(portal)
- log.append('\nFinished conversion process!\n\n')
+# log.append('\nFinished conversion process!\n\n')
- return string.join(log, '\n')
+# return string.join(log, '\n')
+def setupZopeOrgMembership( self ):
+ """ The central conversion method """
+ log.append('LDAP Membership was disabled for now.\n')
+ return string.join(log, '\n')
#
# Helper methods to register varous components with the CMF machinery
More information about the zopeorg-checkins
mailing list