From sidnei at x3ng.com.br Mon Dec 2 15:14:32 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.skel:1.4 cvs.mk:1.8 Message-ID: <200212022014.gB2KEWB09850@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv9841 Modified Files: Makefile.skel cvs.mk Log Message: Updated makefile to use latest versions of software === NZO_SiteLayout/Makefile.skel 1.3 => 1.4 === # define). #----------------------------------------------------------------------- PYTHON_CHECKOUT=src/Python-2.1.3 -ZOPE_CHECKOUT=src/Zope-2.5-head -ZEO_CHECKOUT=src/ZEO-1.0-head +ZOPE_CHECKOUT=src/Zope-2.6-head +ZEO_CHECKOUT=src/ZEO-2.0-head CMF_CHECKOUT=src/CMF-1.3-head SQUID_CHECKOUT=src/Squid-2.4-STABLE6 === NZO_SiteLayout/cvs.mk 1.7 => 1.8 === src/Zope-2.5-head: CVS_MODULE=Zope src/Zope-2.5-head: CVS_TAG=-r Zope-2_5-branch +src/Zope-2.6.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} +src/Zope-2.6.0: CVS_MODULE=Zope +src/Zope-2.6.0: CVS_TAG=-r Zope-2_6_0-src + +src/Zope-2.6-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} +src/Zope-2.6-head: CVS_MODULE=Zope +src/Zope-2.6-head: CVS_TAG=-r Zope-2_6-branch + + + # ZEO versions #src/ZEO-1.0: CVS_MODULE=ZEO # This one doesn't (yet) exist (why?) @@ -62,6 +72,10 @@ src/ZEO-1.0-head: CVS_MODULE=ZEO src/ZEO-1.0-head: CVS_TAG=-r zeo-1_0-branch +src/ZEO-2.0-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} +src/ZEO-2.0-head: CVS_MODULE=ZEO +src/ZEO-2.0-head: CVS_TAG=-r ZODB3-3_1-branch + src/StandaloneZODB-1.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} src/StandaloneZODB-1.0: CVS_MODULE=StandaloneZODB src/StandaloneZODB-1.0: CVS_TAG=-r StandaloneZODB-1_0-branch @@ -71,6 +85,10 @@ src/CMF-1.3: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} src/CMF-1.3: CVS_MODULE=CMF src/CMF-1.3: CVS_TAG=-r CMF-1_3-release + +src/CMF-1.3-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} +src/CMF-1.3-head: CVS_MODULE=CMF +src/CMF-1.3-head: CVS_TAG=-r CMF-1_3-branch src/CMF-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} src/CMF-head: CVS_MODULE=CMF From sidnei at x3ng.com.br Mon Dec 2 15:42:38 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zope:1.6 Message-ID: <200212022042.gB2KgcY18406@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv18396 Modified Files: Makefile.zope Log Message: Updated makefile to use latest versions of software === NZO_SiteLayout/Makefile.zope 1.5 => 1.6 === # cvs.mk for other known checkouts). #----------------------------------------------------------------------- PYTHON_CHECKOUT=src/Python-2.1.3 -ZOPE_CHECKOUT=src/Zope-2.5-head -ZEO_CHECKOUT=src/ZEO-1.0-head -CMF_CHECKOUT=src/CMF-head +ZOPE_CHECKOUT=src/Zope-2.6-head +ZEO_CHECKOUT=src/ZEO-2.0-head +CMF_CHECKOUT=src/CMF-1.3-head include python_targets.mk include zope_targets.mk From sidnei at x3ng.com.br Mon Dec 2 16:03:36 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zinstance:1.7 Message-ID: <200212022103.gB2L3aR26121@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv26112 Modified Files: Makefile.zinstance Log Message: Updated makefile to use latest versions of software === NZO_SiteLayout/Makefile.zinstance 1.6 => 1.7 === # cvs.mk for other known checkouts). #----------------------------------------------------------------------- PYTHON_CHECKOUT=src/Python-2.1.3 -ZOPE_CHECKOUT=src/Zope-2.5-head -ZEO_CHECKOUT=src/ZEO-1.0-head -CMF_CHECKOUT=src/CMF-head +ZOPE_CHECKOUT=src/Zope-2.6-head +ZEO_CHECKOUT=src/ZEO-2.0-head +CMF_CHECKOUT=src/CMF-1.3-head include python_targets.mk include zope_targets.mk From sidnei at x3ng.com.br Mon Dec 2 16:25:35 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - cvs.mk:1.9 zproduct_targets.mk:1.7 Message-ID: <200212022125.gB2LPZv32388@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv32375 Modified Files: cvs.mk zproduct_targets.mk Log Message: Adding ZWiki and BackTalk in place of CMFWiki and removing CMFLDAP === NZO_SiteLayout/cvs.mk 1.8 => 1.9 === ZOPE_CVS_REPOSITORY=:pserver:anonymous@cvs.zope.org:/cvs-repository SQUID_CVS_REPOSITORY=:pserver:anoncvs@cvs.squid-cache.org:/squid ZOPEORG_CVS_REPOSITORY=:pserver:anonymous@cvs.zope.org:/cvs-zopeorg +COLLECTIVE_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/collective +ZWIKI_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/zwiki +BACKTALK_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/backtalk CVS=CVS_RSH=ssh /usr/bin/cvs -z7 -q CVS_UPDATE=${CVS} update -dP === NZO_SiteLayout/zproduct_targets.mk 1.6 => 1.7 === src/ZopeOrg-NV: CVS_MODULE=Products/ZopeOrg-NV src/ZopeOrg-NV: CVS_TAG= -src/CMFLDAP-1.4: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY} -src/CMFLDAP-1.4: CVS_MODULE=Products/CMFLDAP-1.4 -src/CMFLDAP-1.4: CVS_TAG= - src/BTreeFolder2-0.5: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY} src/BTreeFolder2-0.5: CVS_MODULE=Products/BTreeFolder2 src/BTreeFolder2-0.5: CVS_TAG= @@ -27,61 +23,66 @@ src/CMFDateIndexes-NV: CVS_MODULE=Products/CMFDateIndexes-NV src/CMFDateIndexes-NV: CVS_TAG= -src/LDAPUserFolder-1.5b1: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY} -src/LDAPUserFolder-1.5b1: CVS_MODULE=Products/LDAPUserFolder-1.5b1 -src/LDAPUserFolder-1.5b1: CVS_TAG= - -src/CMFWiki-head: CVS_REPOSITORY=:pserver:anonymous@cvs.zope.org:/cvs-repository -src/CMFWiki-head: CVS_MODULE=CMF/CMFWiki -src/CMFWiki-head: CVS_TAG= +src/ZWiki: CVS_REPOSITORY=${ZWIKI_CVS_REPOSITORY} +src/ZWiki: CVS_MODULE=zwiki +src/ZWiki: CVS_TAG= + +src/BackTalk: CVS_REPOSITORY=${BACKTALK_CVS_REPOSITORY} +src/BackTalk: CVS_MODULE=BackTalk +src/BackTalk: CVS_TAG= + +src/CMFBackTalk: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY} +src/CMFBackTalk: CVS_MODULE=CMFBackTalk +src/CMFBackTalk: CVS_TAG= PRODUCT_CHECKOUTS=\ -src/CMFLDAP-1.4 \ src/ZopeOrg-NV \ src/BTreeFolder2-0.5 \ src/Rewriter-NV \ src/DateIndexes-NV \ src/CMFDateIndexes-NV \ -src/LDAPUserFolder-1.5b1 \ -src/CMFWiki-head \ +src/ZWiki \ +src/BackTalk \ +src/CMFBackTalk \ -opt/CMFLDAP: src/CMFLDAP-1.4 opt/ZopeOrg: src/ZopeOrg-NV opt/BTreeFolder2: src/BTreeFolder2-0.5 opt/Rewriter: src/Rewriter-NV opt/DateIndexes: src/DateIndexes-NV opt/CMFDateIndexes: src/CMFDateIndexes-NV -opt/LDAPUserFolder: src/LDAPUserFolder-1.5b1 -opt/CMFWiki: src/CMFWiki-head +opt/ZWiki: src/ZWiki +opt/BackTalk: src/BackTalk +opt/CMFBackTalk: src/CMFBackTalk PRODUCT_OPT_TARGETS=\ -opt/CMFLDAP \ opt/ZopeOrg \ opt/BTreeFolder2 \ opt/Rewriter \ opt/DateIndexes \ opt/CMFDateIndexes \ -opt/LDAPUserFolder \ -opt/CMFWiki \ +opt/ZWiki \ +opt/BackTalk \ +opt/CMFBackTalk \ -${PRODUCTS_DIRECTORY}/CMFLDAP: opt/CMFLDAP ${PRODUCTS_DIRECTORY}/ZopeOrg: opt/ZopeOrg ${PRODUCTS_DIRECTORY}/BTreeFolder2: opt/BTreeFolder2 ${PRODUCTS_DIRECTORY}/Rewriter: opt/Rewriter ${PRODUCTS_DIRECTORY}/DateIndexes: opt/DateIndexes ${PRODUCTS_DIRECTORY}/CMFDateIndexes: opt/CMFDateIndexes -${PRODUCTS_DIRECTORY}/LDAPUserFolder: opt/LDAPUserFolder -${PRODUCTS_DIRECTORY}/CMFWiki: opt/CMFWiki +${PRODUCTS_DIRECTORY}/ZWiki: opt/ZWiki +${PRODUCTS_DIRECTORY}/BackTalk: opt/BackTalk +${PRODUCTS_DIRECTORY}/CMFBackTalk: opt/CMFBackTalk + PRODUCT_VAR_TARGETS=\ -${PRODUCTS_DIRECTORY}/CMFLDAP \ ${PRODUCTS_DIRECTORY}/ZopeOrg \ ${PRODUCTS_DIRECTORY}/BTreeFolder2 \ ${PRODUCTS_DIRECTORY}/Rewriter \ ${PRODUCTS_DIRECTORY}/DateIndexes \ ${PRODUCTS_DIRECTORY}/CMFDateIndexes \ -${PRODUCTS_DIRECTORY}/LDAPUserFolder \ -${PRODUCTS_DIRECTORY}/CMFWiki \ +${PRODUCTS_DIRECTORY}/ZWiki \ +${PRODUCTS_DIRECTORY}/BackTalk \ +${PRODUCTS_DIRECTORY}/CMFBackTalk \ CMF_INSTANCE_TARGETS=\ ${PRODUCTS_DIRECTORY}/CMFCore \ From sidnei at x3ng.com.br Mon Dec 2 17:26:06 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - ZopeOrgWorkflow.py:1.16 Message-ID: <200212022226.gB2MQ6j18689@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV In directory cvs.zope.org:/tmp/cvs-serv18673 Modified Files: ZopeOrgWorkflow.py Log Message: minor change on CMF === Products/ZopeOrg-NV/ZopeOrgWorkflow.py 1.15 => 1.16 === from Globals import InitializeClass from Products.CMFCore.WorkflowCore import ObjectDeleted, ObjectMoved from Products.CMFCore.utils import getToolByName, _checkPermission -from Products.CMFCore.utils import modifyPermissionMappings +from Products.CMFCore.utils import _modifyPermissionMappings from Products.CMFDefault.DefaultWorkflow import DefaultWorkflowDefinition from Products.CMFDefault.Favorite import Favorite from Acquisition import aq_base, aq_inner, aq_parent From sidnei at x3ng.com.br Mon Dec 2 17:59:38 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/doc - required_functionality.txt:1.2 Message-ID: <200212022259.gB2Mxcf28751@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/doc In directory cvs.zope.org:/tmp/cvs-serv28729/doc Modified Files: required_functionality.txt Log Message: Some cleanup to remove LDAP dependencies. We will use ZEUM, not CMFLDAP === Products/ZopeOrg-NV/doc/required_functionality.txt 1.1 => 1.2 === o skin, turn off sidebar - o View LDAP member data + o View ZEUM member data - join date, last login date, sidebar state, last notified of pending deactivation, date deactivated, From sidnei at x3ng.com.br Mon Dec 2 18:00:08 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - __init__.py:1.16 Message-ID: <200212022300.gB2N08h28907@cvs.baymountain.com> 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) From sidnei at x3ng.com.br Mon Dec 2 18:00:08 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.54 setupZopeOrgMembership.py:1.16 Message-ID: <200212022300.gB2N08128911@cvs.baymountain.com> 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 From sidnei at x3ng.com.br Mon Dec 2 18:20:33 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.55 Message-ID: <200212022320.gB2NKXN04141@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv4133/Extensions Modified Files: setupZopeOrg.py Log Message: Looks like DateIndexes were moved into ZopeCore === Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.54 => 1.55 === from Products.Rewriter.Rewriter import manage_addRewriter from Products.PluginIndexes.FieldIndex.FieldIndex import FieldIndex +from Products.PluginIndexes.DateIndex.DateIndex import DateIndex -from Products.DateIndexes.DateIndex import DateIndex -from Products.DateIndexes.DateRangeIndex import DateRangeIndex from Products.CMFDateIndexes.RSCatalogTool import RSCatalogTool from Products.BTreeFolder2.CMFBTreeFolder import manage_addCMFBTreeFolder From sidnei at x3ng.com.br Mon Dec 2 18:07:42 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - zproduct_targets.mk:1.8 Message-ID: <200212022307.gB2N7gm00356@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv331 Modified Files: zproduct_targets.mk Log Message: Looks like DateIndexes were moved into ZopeCore === NZO_SiteLayout/zproduct_targets.mk 1.7 => 1.8 === src/Rewriter-NV: CVS_MODULE=Products/Rewriter-NV src/Rewriter-NV: CVS_TAG= -src/DateIndexes-NV: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY} -src/DateIndexes-NV: CVS_MODULE=Products/DateIndexes-NV -src/DateIndexes-NV: CVS_TAG= +# looks like DateIndexes were incorporated into Zope Core +# src/DateIndexes-NV: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY} +# src/DateIndexes-NV: CVS_MODULE=Products/DateIndexes-NV +# src/DateIndexes-NV: CVS_TAG= src/CMFDateIndexes-NV: CVS_REPOSITORY=${ZOPEORG_CVS_REPOSITORY} src/CMFDateIndexes-NV: CVS_MODULE=Products/CMFDateIndexes-NV @@ -35,54 +36,58 @@ src/CMFBackTalk: CVS_MODULE=CMFBackTalk src/CMFBackTalk: CVS_TAG= +src/DCWorkflow: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} +src/DCWorkflow: CVS_MODULE=CMF/DCWorkflow +src/DCWorkflow: CVS_TAG= + PRODUCT_CHECKOUTS=\ src/ZopeOrg-NV \ src/BTreeFolder2-0.5 \ src/Rewriter-NV \ -src/DateIndexes-NV \ src/CMFDateIndexes-NV \ src/ZWiki \ src/BackTalk \ src/CMFBackTalk \ +src/DCWorkflow \ opt/ZopeOrg: src/ZopeOrg-NV opt/BTreeFolder2: src/BTreeFolder2-0.5 opt/Rewriter: src/Rewriter-NV -opt/DateIndexes: src/DateIndexes-NV opt/CMFDateIndexes: src/CMFDateIndexes-NV opt/ZWiki: src/ZWiki opt/BackTalk: src/BackTalk opt/CMFBackTalk: src/CMFBackTalk +ppt/DCWorkflow: src/DCWorkflow PRODUCT_OPT_TARGETS=\ opt/ZopeOrg \ opt/BTreeFolder2 \ opt/Rewriter \ -opt/DateIndexes \ opt/CMFDateIndexes \ opt/ZWiki \ opt/BackTalk \ opt/CMFBackTalk \ +opt/DCWorkflow \ ${PRODUCTS_DIRECTORY}/ZopeOrg: opt/ZopeOrg ${PRODUCTS_DIRECTORY}/BTreeFolder2: opt/BTreeFolder2 ${PRODUCTS_DIRECTORY}/Rewriter: opt/Rewriter -${PRODUCTS_DIRECTORY}/DateIndexes: opt/DateIndexes ${PRODUCTS_DIRECTORY}/CMFDateIndexes: opt/CMFDateIndexes ${PRODUCTS_DIRECTORY}/ZWiki: opt/ZWiki ${PRODUCTS_DIRECTORY}/BackTalk: opt/BackTalk ${PRODUCTS_DIRECTORY}/CMFBackTalk: opt/CMFBackTalk +${PRODUCTS_DIRECTORY}/DCWorkflow: opt/DCWorkflow PRODUCT_VAR_TARGETS=\ ${PRODUCTS_DIRECTORY}/ZopeOrg \ ${PRODUCTS_DIRECTORY}/BTreeFolder2 \ ${PRODUCTS_DIRECTORY}/Rewriter \ -${PRODUCTS_DIRECTORY}/DateIndexes \ ${PRODUCTS_DIRECTORY}/CMFDateIndexes \ ${PRODUCTS_DIRECTORY}/ZWiki \ ${PRODUCTS_DIRECTORY}/BackTalk \ ${PRODUCTS_DIRECTORY}/CMFBackTalk \ +${PRODUCTS_DIRECTORY}/DCWorkflow \ CMF_INSTANCE_TARGETS=\ ${PRODUCTS_DIRECTORY}/CMFCore \ From sidnei at x3ng.com.br Mon Dec 2 18:36:34 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - zproduct_targets.mk:1.9 Message-ID: <200212022336.gB2NaYx09067@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv9059 Modified Files: zproduct_targets.mk Log Message: Ops, a typo === NZO_SiteLayout/zproduct_targets.mk 1.8 => 1.9 === opt/ZWiki: src/ZWiki opt/BackTalk: src/BackTalk opt/CMFBackTalk: src/CMFBackTalk -ppt/DCWorkflow: src/DCWorkflow +opt/DCWorkflow: src/DCWorkflow PRODUCT_OPT_TARGETS=\ opt/ZopeOrg \ From sidnei at x3ng.com.br Mon Dec 2 18:48:52 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.56 Message-ID: <200212022348.gB2Nmq612695@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv12687/Extensions Modified Files: setupZopeOrg.py Log Message: Ops. Removed wrong Product === Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.55 => 1.56 === NEEDED_PRODUCTS = ( 'CMFDefault' , 'CMFCore' - , 'CMFWiki' + , 'CMFCalendar' , 'ZWiki' , 'BackTalk' , 'CMFBackTalk' From sidnei at x3ng.com.br Mon Dec 2 19:24:20 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - cvsup:1.1 Message-ID: <200212030024.gB30OKc23123@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv23115 Added Files: cvsup Log Message: Almost working cvsup script. Need to grok more the makefile syntax though === Added File NZO_SiteLayout/cvsup === #! /bin/sh # # buildinstance []* # # reldir=`dirname $0` # fill in defaults if test -z "$INSTANCE_PASSWD"; then INSTANCE_PASSWD=123 fi if test -z "$INSTANCE_NAME"; then INSTANCE_NAME=Instance fi if test -z "$INSTANCE_HTTP_PORT"; then INSTANCE_HTTP_PORT=8080 fi if test -z "$INSTANCE_FTP_PORT"; then INSTANCE_FTP_PORT=8021 fi if test -z "$INSTANCE_DAV_PORT"; then INSTANCE_DAV_PORT=9800 fi if test -z "$INSTANCE_MONITOR_PORT"; then INSTANCE_MONITOR_PORT=None fi if test -z "$ZEO_SERVER_HOST"; then ZEO_SERVER_HOST=localhost fi if test -z "$ZEO_SERVER_PORT"; then ZEO_SERVER_PORT=8001 fi if test -z "$ZEO_SERVER_STORAGE"; then ZEO_SERVER_STORAGE=Main fi if test -z "$USE_ZEO_SERVER"; then USE_ZEO_SERVER=0 fi if [ -f $reldir/Makefile.zinstance ]; then /usr/bin/make -f $reldir/Makefile.zinstance \ -I $reldir MAKEFILEDIR=$reldir clean \ INSTANCE_PASSWD=$INSTANCE_PASSWD \ INSTANCE_NAME=$INSTANCE_NAME \ INSTANCE_HTTP_PORT=$INSTANCE_HTTP_PORT \ INSTANCE_FTP_PORT=$INSTANCE_FTP_PORT \ INSTANCE_DAV_PORT=$INSTANCE_DAV_PORT \ INSTANCE_MONITOR_PORT=$INSTANCE_MONITOR_PORT \ ZEO_SERVER_HOST=$ZEO_SERVER_HOST \ ZEO_SERVER_PORT=$ZEO_SERVER_PORT \ ZEO_SERVER_STORAGE=$ZEO_SERVER_STORAGE \ USE_ZEO_SERVER=$USE_ZEO_SERVER /usr/bin/make -f $reldir/Makefile.zinstance \ -I $reldir MAKEFILEDIR=$reldir cvsup \ INSTANCE_PASSWD=$INSTANCE_PASSWD \ INSTANCE_NAME=$INSTANCE_NAME \ INSTANCE_HTTP_PORT=$INSTANCE_HTTP_PORT \ INSTANCE_FTP_PORT=$INSTANCE_FTP_PORT \ INSTANCE_DAV_PORT=$INSTANCE_DAV_PORT \ INSTANCE_MONITOR_PORT=$INSTANCE_MONITOR_PORT \ ZEO_SERVER_HOST=$ZEO_SERVER_HOST \ ZEO_SERVER_PORT=$ZEO_SERVER_PORT \ ZEO_SERVER_STORAGE=$ZEO_SERVER_STORAGE \ USE_ZEO_SERVER=$USE_ZEO_SERVER \ else echo "cvsup []*" echo "acceptable instance variables are:" echo " INSTANCE_PASSWD: admin/superuser password (default '123')" echo " INSTANCE_NAME: 'var'-relative directory name (default 'Instance')" echo " INSTANCE_HTTP_PORT: HTTP port (default '8080')" echo " INSTANCE_FTP_PORT: FTP port (default '8021')" echo " INSTANCE_DAV_PORT: DAV source port (default '9088')" echo " INSTANCE_MONITOR_PORT: Zope monitor port (default 'None')" echo " ZEO_SERVER_HOST: ZEO server hostname (default 'localhost')" echo " ZEO_SERVER_PORT: ZEO server portname (default '8001')" echo " ZEO_SERVER_STORAGE: storage name on ZSS (default 'Main')" echo " USE_ZEO_SERVER: 1 if ZEO server is used, 0 if local FileStorage" fi From sidnei at x3ng.com.br Mon Dec 2 19:25:22 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - standard_targets.mk:1.4 Message-ID: <200212030025.gB30PM423372@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv23364 Modified Files: standard_targets.mk Log Message: Almost working cvsup script. Need to grok more the makefile syntax though === NZO_SiteLayout/standard_targets.mk 1.3 => 1.4 === clean: ${RM} ${OPT_TARGETS} +cvsup: + ${foreach ${DIR},${SRC_TARGETS},${${CD} ${DIR} && ${CVSUP}}} + clobber: clean ${RM} {bin,opt,include,lib,man,src} From sidnei at x3ng.com.br Tue Dec 3 08:14:45 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - cleaninstance:1.1 standard_targets.mk:1.5 tools.mk:1.3 zproduct_targets.mk:1.10 Message-ID: <200212031314.gB3DEjq05292@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv5276 Modified Files: standard_targets.mk tools.mk zproduct_targets.mk Added Files: cleaninstance Log Message: cleaninstance support === Added File NZO_SiteLayout/cleaninstance === #! /bin/sh # # buildinstance []* # # reldir=`dirname $0` # fill in defaults if test -z "$INSTANCE_PASSWD"; then INSTANCE_PASSWD=123 fi if test -z "$INSTANCE_NAME"; then INSTANCE_NAME=Instance fi if test -z "$INSTANCE_HTTP_PORT"; then INSTANCE_HTTP_PORT=8080 fi if test -z "$INSTANCE_FTP_PORT"; then INSTANCE_FTP_PORT=8021 fi if test -z "$INSTANCE_DAV_PORT"; then INSTANCE_DAV_PORT=9800 fi if test -z "$INSTANCE_MONITOR_PORT"; then INSTANCE_MONITOR_PORT=None fi if test -z "$ZEO_SERVER_HOST"; then ZEO_SERVER_HOST=localhost fi if test -z "$ZEO_SERVER_PORT"; then ZEO_SERVER_PORT=8001 fi if test -z "$ZEO_SERVER_STORAGE"; then ZEO_SERVER_STORAGE=Main fi if test -z "$USE_ZEO_SERVER"; then USE_ZEO_SERVER=0 fi if [ -f $reldir/Makefile.zinstance ]; then /usr/bin/make -f $reldir/Makefile.zinstance \ -I $reldir MAKEFILEDIR=$reldir clean cleaninstance \ INSTANCE_PASSWD=$INSTANCE_PASSWD \ INSTANCE_NAME=$INSTANCE_NAME \ INSTANCE_HTTP_PORT=$INSTANCE_HTTP_PORT \ INSTANCE_FTP_PORT=$INSTANCE_FTP_PORT \ INSTANCE_DAV_PORT=$INSTANCE_DAV_PORT \ INSTANCE_MONITOR_PORT=$INSTANCE_MONITOR_PORT \ ZEO_SERVER_HOST=$ZEO_SERVER_HOST \ ZEO_SERVER_PORT=$ZEO_SERVER_PORT \ ZEO_SERVER_STORAGE=$ZEO_SERVER_STORAGE \ USE_ZEO_SERVER=$USE_ZEO_SERVER else echo "cleaninstance []*" echo "acceptable instance variables are:" echo " INSTANCE_PASSWD: admin/superuser password (default '123')" echo " INSTANCE_NAME: 'var'-relative directory name (default 'Instance')" echo " INSTANCE_HTTP_PORT: HTTP port (default '8080')" echo " INSTANCE_FTP_PORT: FTP port (default '8021')" echo " INSTANCE_DAV_PORT: DAV source port (default '9088')" echo " INSTANCE_MONITOR_PORT: Zope monitor port (default 'None')" echo " ZEO_SERVER_HOST: ZEO server hostname (default 'localhost')" echo " ZEO_SERVER_PORT: ZEO server portname (default '8001')" echo " ZEO_SERVER_STORAGE: storage name on ZSS (default 'Main')" echo " USE_ZEO_SERVER: 1 if ZEO server is used, 0 if local FileStorage" fi === NZO_SiteLayout/standard_targets.mk 1.4 => 1.5 === clean: ${RM} ${OPT_TARGETS} -cvsup: - ${foreach ${DIR},${SRC_TARGETS},${${CD} ${DIR} && ${CVSUP}}} +cleaninstance: + ${RM} ${SRC_TARGETS} + ${RM} ${PRODUCT_VAR_TARGETS} + ${RM} ${CMF_INSTANCE_TARGETS} clobber: clean ${RM} {bin,opt,include,lib,man,src} @@ -32,6 +34,7 @@ clobber \ standard_usage \ usage \ +cleaninstance \ standard_usage: @${ECHO} "----------------------------------------------------------" === NZO_SiteLayout/tools.mk 1.2 => 1.3 === CHMOD=/bin/chmod SUDO=sudo CHOWN=/bin/chown +CVSUP=/usr/bin/cvs up -dP # # We may have to arrange to get these built on some systems. === NZO_SiteLayout/zproduct_targets.mk 1.9 => 1.10 === src/CMFDateIndexes-NV: CVS_MODULE=Products/CMFDateIndexes-NV src/CMFDateIndexes-NV: CVS_TAG= -src/ZWiki: CVS_REPOSITORY=${ZWIKI_CVS_REPOSITORY} -src/ZWiki: CVS_MODULE=zwiki -src/ZWiki: CVS_TAG= - -src/BackTalk: CVS_REPOSITORY=${BACKTALK_CVS_REPOSITORY} -src/BackTalk: CVS_MODULE=BackTalk -src/BackTalk: CVS_TAG= - -src/CMFBackTalk: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY} -src/CMFBackTalk: CVS_MODULE=CMFBackTalk -src/CMFBackTalk: CVS_TAG= - -src/DCWorkflow: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} -src/DCWorkflow: CVS_MODULE=CMF/DCWorkflow -src/DCWorkflow: CVS_TAG= +src/ZWiki-head: CVS_REPOSITORY=${ZWIKI_CVS_REPOSITORY} +src/ZWiki-head: CVS_MODULE=zwiki +src/ZWiki-head: CVS_TAG= + +src/BackTalk-head: CVS_REPOSITORY=${BACKTALK_CVS_REPOSITORY} +src/BackTalk-head: CVS_MODULE=BackTalk +src/BackTalk-head: CVS_TAG= + +src/CMFBackTalk-head: CVS_REPOSITORY=${COLLECTIVE_CVS_REPOSITORY} +src/CMFBackTalk-head: CVS_MODULE=CMFBackTalk +src/CMFBackTalk-head: CVS_TAG= + +src/DCWorkflow-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} +src/DCWorkflow-head: CVS_MODULE=Products/DCWorkflow +src/DCWorkflow-head: CVS_TAG= PRODUCT_CHECKOUTS=\ src/ZopeOrg-NV \ src/BTreeFolder2-0.5 \ src/Rewriter-NV \ src/CMFDateIndexes-NV \ -src/ZWiki \ -src/BackTalk \ -src/CMFBackTalk \ -src/DCWorkflow \ +src/ZWiki-head \ +src/BackTalk-head \ +src/CMFBackTalk-head \ +src/DCWorkflow-head \ opt/ZopeOrg: src/ZopeOrg-NV opt/BTreeFolder2: src/BTreeFolder2-0.5 opt/Rewriter: src/Rewriter-NV opt/CMFDateIndexes: src/CMFDateIndexes-NV -opt/ZWiki: src/ZWiki -opt/BackTalk: src/BackTalk -opt/CMFBackTalk: src/CMFBackTalk -opt/DCWorkflow: src/DCWorkflow +opt/ZWiki: src/ZWiki-head +opt/BackTalk: src/BackTalk-head +opt/CMFBackTalk: src/CMFBackTalk-head +opt/DCWorkflow: src/DCWorkflow-head PRODUCT_OPT_TARGETS=\ opt/ZopeOrg \ @@ -77,7 +77,6 @@ ${PRODUCTS_DIRECTORY}/BackTalk: opt/BackTalk ${PRODUCTS_DIRECTORY}/CMFBackTalk: opt/CMFBackTalk ${PRODUCTS_DIRECTORY}/DCWorkflow: opt/DCWorkflow - PRODUCT_VAR_TARGETS=\ ${PRODUCTS_DIRECTORY}/ZopeOrg \ From sidnei at x3ng.com.br Tue Dec 3 10:08:57 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - cvs.mk:1.10 standard_targets.mk:1.6 zproduct_targets.mk:1.11 Message-ID: <200212031508.gB3F8vZ03287@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv3273 Modified Files: cvs.mk standard_targets.mk zproduct_targets.mk Log Message: A few more products added to sandbox setup === NZO_SiteLayout/cvs.mk 1.9 => 1.10 === COLLECTIVE_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/collective ZWIKI_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/zwiki BACKTALK_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/backtalk +PLONE_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/plone +FORMULATOR_CVS_REPOSITORY=:pserver:anonymous@cvs.sf.net:/cvsroot/formulator CVS=CVS_RSH=ssh /usr/bin/cvs -z7 -q CVS_UPDATE=${CVS} update -dP === NZO_SiteLayout/standard_targets.mk 1.5 => 1.6 === docs: ${DOC_TARGETS} doc/README.txt -compile: ${OPT_TARGETS} +compile: clean ${OPT_TARGETS} install: compile ${BIN_TARGETS} === NZO_SiteLayout/zproduct_targets.mk 1.10 => 1.11 === src/DCWorkflow-head: CVS_MODULE=Products/DCWorkflow src/DCWorkflow-head: CVS_TAG= +src/CMFPlone-1.0: CVS_REPOSITORY=${PLONE_CVS_REPOSITORY} +src/CMFPlone-1.0: CVS_MODULE=CMFPlone +src/CMFPlone-1.0: CVS_TAG=Plone-1_0 + +src/Formulator-head: CVS_REPOSITORY=${FORMULATOR_CVS_REPOSITORY} +src/Formulator-head: CVS_MODULE=Formulator +src/Formulator-head: CVS_TAG= + PRODUCT_CHECKOUTS=\ src/ZopeOrg-NV \ src/BTreeFolder2-0.5 \ @@ -49,6 +57,8 @@ src/BackTalk-head \ src/CMFBackTalk-head \ src/DCWorkflow-head \ +src/CMFPlone-1.0 \ +src/Formulator-head \ opt/ZopeOrg: src/ZopeOrg-NV opt/BTreeFolder2: src/BTreeFolder2-0.5 @@ -58,6 +68,8 @@ opt/BackTalk: src/BackTalk-head opt/CMFBackTalk: src/CMFBackTalk-head opt/DCWorkflow: src/DCWorkflow-head +opt/CMFPlone: src/CMFPlone-1.0 +opt/Formulator: src/Formulator-head PRODUCT_OPT_TARGETS=\ opt/ZopeOrg \ @@ -68,6 +80,8 @@ opt/BackTalk \ opt/CMFBackTalk \ opt/DCWorkflow \ +opt/CMFPlone \ +opt/Formulator \ ${PRODUCTS_DIRECTORY}/ZopeOrg: opt/ZopeOrg ${PRODUCTS_DIRECTORY}/BTreeFolder2: opt/BTreeFolder2 @@ -77,6 +91,8 @@ ${PRODUCTS_DIRECTORY}/BackTalk: opt/BackTalk ${PRODUCTS_DIRECTORY}/CMFBackTalk: opt/CMFBackTalk ${PRODUCTS_DIRECTORY}/DCWorkflow: opt/DCWorkflow +${PRODUCTS_DIRECTORY}/CMFPlone: opt/CMFPlone +${PRODUCTS_DIRECTORY}/Formulator: opt/Formulator PRODUCT_VAR_TARGETS=\ ${PRODUCTS_DIRECTORY}/ZopeOrg \ @@ -87,6 +103,8 @@ ${PRODUCTS_DIRECTORY}/BackTalk \ ${PRODUCTS_DIRECTORY}/CMFBackTalk \ ${PRODUCTS_DIRECTORY}/DCWorkflow \ +${PRODUCTS_DIRECTORY}/CMFPlone \ +${PRODUCTS_DIRECTORY}/Formulator \ CMF_INSTANCE_TARGETS=\ ${PRODUCTS_DIRECTORY}/CMFCore \ From sidnei at x3ng.com.br Tue Dec 3 10:09:29 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.57 Message-ID: <200212031509.gB3F9T203617@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv3595/Extensions Modified Files: setupZopeOrg.py Log Message: Disabled skeleton for now === Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.56 => 1.57 === ) # Create all the extra directories we need - log.append('\n * Creating default folder structure') - log_str = portal.ZO_synchronizeSkeleton() - log_list = string.split( log_str, '\n' ) + #log.append('\n * Creating default folder structure') + #log_str = portal.ZO_synchronizeSkeleton() + #log_list = string.split( log_str, '\n' ) - for log_line in log_list: - if string.find( log_line, ' ' ) != -1: - log.append( log_line ) + #for log_line in log_list: + # if string.find( log_line, ' ' ) != -1: + # log.append( log_line ) - # Run the CMFWiki install script + # Run the ZWiki install script log.append( '\n * Executing the ZWiki install script' ) log_str = portal.ZO_setupZWiki() log_list = string.split( log_str, '\n' ) From sidnei at x3ng.com.br Tue Dec 3 10:09:29 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - ZopeOrgWorkflow.py:1.17 Message-ID: <200212031509.gB3F9TM03615@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV In directory cvs.zope.org:/tmp/cvs-serv3595 Modified Files: ZopeOrgWorkflow.py Log Message: Disabled skeleton for now === Products/ZopeOrg-NV/ZopeOrgWorkflow.py 1.16 => 1.17 === # Modify role to permission mappings directly. - return modifyPermissionMappings(ob, + return _modifyPermissionMappings(ob, {'View': {'Anonymous': anon_view, 'Reviewer': reviewer_view, 'Owner': 1, From sidnei at x3ng.com.br Tue Dec 3 11:01:52 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - nzo.css.dtml:1.1 main_template.html:1.12 nzoWidgets.css.dtml:NONE nzoStructure.css.dtml:NONE nzoBasic.css.dtml:NONE Message-ID: <200212031601.gB3G1qX15691@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo In directory cvs.zope.org:/tmp/cvs-serv15678/skins/nzo Modified Files: main_template.html Added Files: nzo.css.dtml Removed Files: nzoWidgets.css.dtml nzoStructure.css.dtml nzoBasic.css.dtml Log Message: Added External Editor to install CSS Cleanup === Added File Products/ZopeOrg-NV/skins/nzo/nzo.css.dtml === (781/881 lines abridged) /* ** Plone style sheet for CSS2-capable browsers. ** Alexander Limi, 2002 - http://limi.net ** ** Thanks to Geir Bækholt, Stian Søiland for input and guidance. ** ** Style sheet documentation can be found at http://plone.org/documentation ** */ /* ** Instructions to set caching headers. Inside comments area to play nicer with CSS editors. ** ** ** ** ** ** ** */ /* */ body { font: 0.8em Verdana, Helvetica, Arial, sans-serif; background: White; color: Black; margin: 0; padding: 0; /* These work in IE only, changes the look of the scrollbar + textareas */ scrollbar-base-color: #DEE7EC; scrollbar-highlight-color: #DEE7EC; scrollbar-track-color: #F7F9FA; scrollbar-darkshadow-color: #F7F9FA; scrollbar-3dlight-color: #8CACBB; scrollbar-shadow-color: #8CACBB; scrollbar-arrow-color: #436976; } table { font-size: 100%; } a { text-decoration: none; color: #436976; background-color: transparent; } table { [-=- -=- -=- 781 lines omitted -=- -=- -=-] text-decoration: none; } table.calendar th { background-color: #DEE7EC; color: Black; font-weight: bold; text-align: center; } table.calendar td { background-color: transparent; width: 1.5em; padding: 2px; } table.calendar td.weekdays { background-color: #DEE7EC; border: 1px solid #8CACBB; border-style: solid none; text-align: center; } table.calendar td.event { background-color: #DEE7EC; font-weight: bold; } table.calendar td.noevent { background-color: transparent; } table.calendar td.todayevent { background-color: #DEE7EC; border: 2px solid #FFA500; font-weight: bold; } table.calendar td.todaynoevent { border-collapse: collapse; border: 2px solid #FFA500; } /* */ === Products/ZopeOrg-NV/skins/nzo/main_template.html 1.11 => 1.12 === - - - - - + @@ -102,14 +94,6 @@ - - - - - - - - === Removed File Products/ZopeOrg-NV/skins/nzo/nzoWidgets.css.dtml === === Removed File Products/ZopeOrg-NV/skins/nzo/nzoStructure.css.dtml === === Removed File Products/ZopeOrg-NV/skins/nzo/nzoBasic.css.dtml === From sidnei at x3ng.com.br Tue Dec 3 11:03:36 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.58 Message-ID: <200212031603.gB3G3a516073@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv16063/Extensions Modified Files: setupZopeOrg.py Log Message: Added External Editor === Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.57 => 1.58 === INVISIBLE_TYPES = ( 'Wiki Page' , 'Software Release' - , 'Software Release File' + , 'Software Release File' + , 'BackTalk Document' ) OLD_SITE_URL = 'http://old.zope.org/' @@ -44,6 +45,9 @@ , 'PageTemplates' , 'Rewriter' , 'BTreeFolder2' + , 'CMFPlone' + , 'Formulator' + , 'ExternalEditor' ) SKINPATHS = ( 'Basic', ) From sidnei at x3ng.com.br Tue Dec 3 14:36:24 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.1 Message-ID: <200212031936.gB3JaOt03857@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv3847/Extensions Added Files: NZOMigrate.py Log Message: migration script === Added File Products/ZopeOrg-NV/Extensions/NZOMigrate.py === from StringIO import StringIO from ZODB.POSException import POSKeyError from Acquisition import aq_base from Products.CMFCore.utils import getToolByName import zLOG def migrate(source, dest, ignore_path=None, type_map=None): dest_path = dest.getPhysicalPath() if ignore_path is None: ignore_path = [] if not dest_path in ignore_path: ignore_path.append(dest_path) ignore_path = [tuple(p.split('/')) for p in ignore_path \ if type(p) == type('')] if type_map is None: type_map = {"Formatted Document" : "CMF Default Document", "STX Document" : "CMF Default Document", "HTML Document" : "CMF Default Document", "Link" : "CMF Default Link", "News Item": "CMF Default News Item", "Folder": "CMF Portal Folder", "Image": "CMF Default Image", "File": "CMF Default File", "Tip": "ZopeOrg Tip", "HowTo": "ZopeOrg HowTo", "Software Product": "CMF Software Package", "Product Release": "CMF Software Release", "Tracker": "CMF Collector", "User Folder": "User Folder", "Members Folder": "User Folder", "ZCatalog": "ZCatalog", "BTree Folder": "CMF BTree Folder", "ZWiki Page": "ZWiki Page", "Broken Because Product is Gone": "BBR", "XML Document": "XML Document", "BackTalk Book": "CMF BackTalk Book", "BackTalk Document": "CMF BackTalk Document" } tmut = Transmutator(source, dest, ignore_path, type_map) return tmut.run() def normalizeMetaType(meta_type): return meta_type.replace(' ', '') def fixZWikiPortalType(self): ct = self.portal_catalog result = ct(meta_type='ZWiki Page') counter = 0 for r in result: obj = ct.getobject(r.data_record_id_) obj.portal_type = 'ZWiki Page' ct.reindexObject(obj, idxs=['portal_type']) counter += 1 if not (counter % 100): get_transaction().commit(1) return 'ok' def _cleanupOwnership(ob, res, cleanup_children): ''' If the user name of the owner of the referenced object is not found in its current user database but is found in the local user database, this function changes the ownership of the object to the local database. ''' try: changed = ob._p_changed except: changed = 0 owner = getattr(ob, '_owner', None) if owner: udb, uid = owner #res.append('Owner of %s is %s!%s' % ( # join(ob.getPhysicalPath(), '/'), join(udb, '/'), uid,)) root = ob.getPhysicalRoot() try: db = root.unrestrictedTraverse(udb, None) user = db.getUserById(uid) if hasattr(ob, 'aq_inContextOf'): ucontext = aq_parent(aq_inner(db)) if not ob.aq_inContextOf(ucontext): # Not in the right context. user = None except: user = None if user is None: # Try to change to a local database. p = ob old_udb = udb udb = None while p is not None: if hasattr(p, 'acl_users'): acl_users = p.acl_users try: user = acl_users.getUserById(uid) except: user = None if user is not None: # Found the right database. udb = acl_users.getPhysicalPath()[1:] break p = aq_parent(aq_inner(p)) if udb is not None: ob._owner = udb, uid res.append('Changed ownership of %s from %s!%s to %s!%s' % (join(ob.getPhysicalPath(), '/'), join(old_udb, '/'), uid, join(udb, '/'), uid,)) else: res.append('Could not fix the ownership of %s, ' 'which is set to %s!%s' % (join(ob.getPhysicalPath(), '/'), join(old_udb, '/'), uid,)) if cleanup_children: if hasattr(ob, 'objectValues'): for subob in ob.objectValues(): _cleanupOwnership(subob, res, 1) # Deactivate object if possible. if changed is None: ob._p_deactivate() return res class Transmutator: def __init__(self, source, dest, ignore_path, type_map): self._source = source self._dest = dest self._ignore_path = ignore_path self._type_map = type_map self._out = StringIO() def log(self, message, summary='', severity=0, dup=1): self._out.write(message) if dup: zLOG.LOG('NZOMigration: ',severity,summary,message) def getMigrationMethod(self, obj): if hasattr(obj, 'meta_type'): mt = getattr(obj, 'meta_type') if callable(mt): mt = mt() else: mt = obj.__class__.__name__ tm = self._type_map dt = tm.get(mt, None) if dt is None: mmt = 'defaultMigrationMethod' else: nmt = normalizeMetaType mmt = '%s2%s' % (nmt(mt), nmt(dt)) obj_url = obj.absolute_url(relative=1) self.log('Will use %s to migrate %s (%s)\n' % \ (mmt, obj_url, mt)) return getattr(self, mmt, self.defaultMigrationMethod) def defaultMigrationMethod(self, obj, source, dest): try: copy = obj._getCopy(dest) dest._setObject(obj.getId(), copy) except: self.log('Could not copy %s (%s). Possibly duplicate id.\n'\ % (obj.getId(), obj.absolute_url(relative=1))) return None return getattr(dest, obj.getId()) def BrokenBecauseProductisGone2BBR(self, obj, source, dest): self.log('Ignoring Broken Beyond Repair.\n') return None def ZWikiPage2ZWikiPage(self, obj, source, dest): obj = self.defaultMigrationMethod(obj, source, dest) return obj def ZCatalog2ZCatalog(self, obj, source, dest): self.log('Ignoring ZCatalog for now.\n') return None def UserFolder2UserFolder(self, obj, source, dest): self.log('Ignoring User Folder for now.\n') return None def MembersFolder2UserFolder(self, obj, source, dest): self.log('Ignoring Members Folder for now.\n') return None def SoftwareProduct2CMFSoftwarePackage(self, obj, source, dest): self.log('Ignoring Software Product for now.\n') return None def ProductRelease2CMFSoftwareRelease(self, obj, source, dest): self.log('Ignoring Product Release for now.\n') return None def Tracker2CMFCollector(self, obj, source, dest): self.log('Ignoring Tracker for now.\n') return None def XMLDocument2XMLDocument(self, obj, source, dest): self.log('Ignoring XML Document for now.\n') return None def BackTalkBook2CMFBackTalkBook(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='BackTalk Book') book = getattr(dest, obj.getId()) for prop in obj.propertyIds(): if prop in ['header', 'summary']: continue value = obj.getProperty(prop) if value is not None: book._updateProperty(prop, value) if obj.hasProperty('header'): book._updateProperty('book_header', obj.getProperty('header')) if obj.hasProperty('summary'): book.setDescription(obj.getProperty('summary')) return book def BackTalkDocument2CMFBackTalkDocument(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='BackTalk Document') doc = getattr(dest, obj.getId()) for prop in obj.propertyIds(): if prop in ['summary']: continue value = obj.getProperty(prop) if value is not None: doc._updateProperty(prop, value) if obj.hasProperty('summary'): doc.setDescription(obj.getProperty('summary')) doc.munge(obj.read()) return doc def File2CMFDefaultFile(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='File') f = getattr(dest, obj.getId()) title = obj.title or '' content_type = obj.content_type data, size = f._read_data(obj.data) f.update_data(data, content_type, size) f.setTitle(title) f.setFormat(content_type) return f def Image2CMFDefaultImage(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='Image') f = getattr(dest, obj.getId()) title = obj.title or '' content_type = obj.content_type data, size = f._read_data(obj.data) f.update_data(data, content_type, size) f.setTitle(title) f.setFormat(content_type) return f def NewsItem2CMFDefaultNewsItem(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='News Item') news = getattr(dest, obj.getId()) title = obj.title or '' text = obj.text format = obj.format subject = (type(obj.subject) in [type(''), type([])]) and \ obj.subject or [] subject.extend(obj.NewsItem_topics) news.setTitle(title) news.edit(text_format=format, text=text) news.setSubject(subject) return news def Link2CMFDefaultLink(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='Link') link = getattr(dest, obj.getId()) title = obj.title or '' description = (type(obj.description) == type('')) and \ obj.description or '' subject = (type(obj.subject) in [type(''), type([])]) and \ obj.subject or [] subject.extend(obj.Link_topics) remote_url = obj.remote_url zope_powered = obj.zope_powered or 0 link.setTitle(title) link.setDescription(description) link.edit(remote_url=remote_url) link.setSubject(subject) link.manage_addProperty('zope_powered', zope_powered, 'boolean') return link def FormattedDocument2CMFDefaultDocument(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='Document') doc = getattr(dest, obj.getId()) title = obj.title or '' description = (type(obj.description) == type('')) and \ obj.description or '' text = obj.content format = hasattr(obj, 'format') and obj.format or 'structured-text' subject = (type(obj.subject) in [type(''), type([])]) and \ obj.subject or [] doc.setTitle(title) doc.setDescription(description) doc.edit(text_format=format, text=text) doc.setSubject(subject) return doc STXDocument2CMFDefaultDocument = FormattedDocument2CMFDefaultDocument HTMLDocument2CMFDefaultDocument = FormattedDocument2CMFDefaultDocument def Tip2ZopeOrgTip(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='Tip') tip = getattr(dest, obj.getId()) title = obj.tip or '' description = obj.details or '' text = obj.content format = obj.format subject = (type(obj.subject) in [type(''), type([])]) and \ obj.subject or [] subject.extend(obj.tip_topics) tip.setTitle(title) tip.setDescription(description) tip.edit(text_format=format, text=text) tip.setSubject(subject) return tip def HowTo2ZopeOrgHowTo(self, obj, source, dest): dest.invokeFactory(id=obj.getId(), type_name='HowTo') howto = getattr(dest, obj.getId()) title = obj.title or '' text = obj.content format = obj.format subject = (type(obj.subject) in [type(''), type([])]) and \ obj.subject or [] subject.extend(obj.HowTo_topics) howto.setTitle(title) howto.edit(text_format=format, text=text) howto.setSubject(subject) return howto def Folder2CMFPortalFolder(self, obj, source, dest): if dest is None or obj is None: return None try: dest.manage_addFolder(obj.getId(), obj.title) except: pass new = getattr(dest, obj.getId(), None) if new is not None and hasattr(new, 'portal_type') and\ new.portal_type == "Folder": return new return None def BTreeFolder2CMFBTreeFolder(self, obj, source, dest): if dest is None or obj is None: return None try: bt2 = dest.manage_addProduct['BTreeFolder2'] bt2.manage_addCMFBTreeFolder(obj.getId(), obj.title) except: pass new = getattr(dest, obj.getId(), None) if new is not None and hasattr(new, 'portal_type') and\ new.portal_type == "Folder": return new return None def WikiMethodsCleanup(self, obj, ignore_path): obj_ids = [] if hasattr(obj, 'keys'): obj_ids = obj.keys() elif hasattr(obj, 'objectIds'): obj_ids = obj.objectIds() if obj_ids: if 'FrontPage' in obj_ids or \ 'standard_wiki_header' in obj_ids or \ 'standard_wiki_page' in obj_ids: obj_path = obj.getPhysicalPath() for dm in ('standard_wiki_header', 'standard_wiki_footer', 'editform', 'commentform', 'backlinks', 'advancedform', 'pagehistory', 'search', 'standard_wiki_page', 'title_prefix'): # We can possibly remove those later also # 'AllPages', 'BackLinks', 'HelpPage' # 'HowDoIEdit', 'HowDoINavigate', 'JumpTo', # 'RecentChanges', 'RegulatingYourPages', # 'RemoteWikiLinks', 'RemoteWikiURL', # 'SandBox', 'SearchPage', 'StructuredText', # 'StructuredTextExamples', 'StructuredTextRules', # 'TextFormattingRiges', 'VisitorLog', 'WikiName', # 'WikiWikiWeb', 'ZWiki', 'ZWikiLinks', 'ZWikiWeb' if dm in obj_ids: ignore_path.append(obj_path + (dm,)) return ignore_path def DefaultDTMLCleanup(self, obj, ignore_path): if hasattr(obj, 'keys'): obj_ids = obj.keys() elif hasattr(obj, 'objectIds'): obj_ids = obj.objectIds() if obj_ids: if 'index_html' in obj_ids and \ obj.index_html.meta_type in ['DTML Method', 'DTML Document'] : obj_path = obj.getPhysicalPath() for dm in ('index_html', 'local_nav', 'page_title', 'standard_html_footer', 'standard_html_header', 'local_css', 'custom_html_header', 'custom_html_footer', 'local_exit'): if dm in obj_ids: ignore_path.append(obj_path + (dm,)) return ignore_path def fixOwnership(self, orig, new): owner = getattr(orig, '_owner', None) if owner is not None: try: # Retain ownership. new._owner = owner except: pass return new def fixModificationDate(self, orig, new): mod_date = orig.bobobase_modification_time().ISO() if hasattr(aq_base(new), 'setModificationDate'): new.setModificationDate(mod_date) return new def run(self): source = self._source dest = self._dest ignore = self._ignore_path if hasattr(source, 'objectIds') and \ hasattr(source, 'getPhysicalPath'): path = source.getPhysicalPath() oids = [o for o in source.objectIds() \ if (path + (o, )) not in ignore] oids.sort() for oid in oids: obj = getattr(source, oid) try: # We may want to catch POSKeyErrors early, # so lets prod the object and see what happens obj_url = obj.absolute_url(relative=1) except POSKeyError: # Skip this object self.log('POSKeyError while trying to access' +\ ' %s.\n' % '/'.join(path + (oid, ))) continue mm = self.getMigrationMethod(obj) try: new_obj = mm(obj, source, dest) except: new_obj = None if new_obj is None or not new_obj: self.log('Result of conversion of' +\ ' %s: Failed.\n' % obj.absolute_url(relative=1)) else: new_obj = self.fixOwnership(obj, new_obj) new_obj = self.fixModificationDate(obj, new_obj) ct = getToolByName(new_obj, 'portal_catalog', None) if ct is not None: try: ct.reindexObject(obj) except: pass self.log('Result of conversion of' +\ ' %s: Success.\n' % obj.absolute_url(relative=1)) if hasattr(obj, 'objectIds') and new_obj is not None: ignore = self.WikiMethodsCleanup(obj, ignore) ignore = self.DefaultDTMLCleanup(obj, ignore) get_transaction().commit(1) self.log(Transmutator(obj, new_obj, \ ignore, self._type_map).run(), dup=0) get_transaction().commit() return 'Ok.\n' or self._out.getvalue() if __name__ == '__main__': print 'ok' From sidnei at x3ng.com.br Tue Dec 3 14:39:34 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - setupZopeOrg.py:1.59 Message-ID: <200212031939.gB3JdYu04596@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv4586/Extensions Modified Files: setupZopeOrg.py Log Message: Create Ext. Method for migration === Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.58 => 1.59 === , 'module' : 'ZWiki.cmf_install_zwiki' , 'function' : 'install' } + , { 'id' : 'ZO_NZOMigrate' + , 'title' : 'Migrate script for NZO' + , 'module' : 'ZopeOrg.NZOMigrate' + , 'function' : 'migrate' + } , { 'id' : 'localattr' , 'title' : 'localattr' , 'module' : 'ZopeOrg.utils' From sidnei at x3ng.com.br Wed Dec 4 10:33:08 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - zproduct_targets.mk:1.12 Message-ID: <200212041533.gB4FX8o23713@cvs.baymountain.com> Update of /cvs-zopeorg/NZO_SiteLayout In directory cvs.zope.org:/tmp/cvs-serv23705 Modified Files: zproduct_targets.mk Log Message: Added ExternalEditor to the mix === NZO_SiteLayout/zproduct_targets.mk 1.11 => 1.12 === src/Formulator-head: CVS_MODULE=Formulator src/Formulator-head: CVS_TAG= +src/ExternalEditor-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY} +src/ExternalEditor-head: CVS_MODULE=Products/ExternalEditor +src/ExternalEditor-head: CVS_TAG= + PRODUCT_CHECKOUTS=\ src/ZopeOrg-NV \ src/BTreeFolder2-0.5 \ @@ -59,6 +63,7 @@ src/DCWorkflow-head \ src/CMFPlone-1.0 \ src/Formulator-head \ +src/ExternalEditor-head \ opt/ZopeOrg: src/ZopeOrg-NV opt/BTreeFolder2: src/BTreeFolder2-0.5 @@ -70,6 +75,7 @@ opt/DCWorkflow: src/DCWorkflow-head opt/CMFPlone: src/CMFPlone-1.0 opt/Formulator: src/Formulator-head +opt/ExternalEditor: src/ExternalEditor-head PRODUCT_OPT_TARGETS=\ opt/ZopeOrg \ @@ -82,6 +88,7 @@ opt/DCWorkflow \ opt/CMFPlone \ opt/Formulator \ +opt/ExternalEditor \ ${PRODUCTS_DIRECTORY}/ZopeOrg: opt/ZopeOrg ${PRODUCTS_DIRECTORY}/BTreeFolder2: opt/BTreeFolder2 @@ -93,6 +100,7 @@ ${PRODUCTS_DIRECTORY}/DCWorkflow: opt/DCWorkflow ${PRODUCTS_DIRECTORY}/CMFPlone: opt/CMFPlone ${PRODUCTS_DIRECTORY}/Formulator: opt/Formulator +${PRODUCTS_DIRECTORY}/ExternalEditor: opt/ExternalEditor PRODUCT_VAR_TARGETS=\ ${PRODUCTS_DIRECTORY}/ZopeOrg \ @@ -105,6 +113,7 @@ ${PRODUCTS_DIRECTORY}/DCWorkflow \ ${PRODUCTS_DIRECTORY}/CMFPlone \ ${PRODUCTS_DIRECTORY}/Formulator \ +${PRODUCTS_DIRECTORY}/ExternalEditor \ CMF_INSTANCE_TARGETS=\ ${PRODUCTS_DIRECTORY}/CMFCore \ From sidnei at x3ng.com.br Wed Dec 4 13:13:02 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.2 setupZopeOrg.py:1.60 Message-ID: <200212041813.gB4ID2A29082@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv29026/Extensions Modified Files: NZOMigrate.py setupZopeOrg.py Log Message: Updated Migration to use CMFPackage. Needs testing. === Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.1 => 1.2 === return None def SoftwareProduct2CMFSoftwarePackage(self, obj, source, dest): - self.log('Ignoring Software Product for now.\n') - return None + dest.invokeFactory(id=obj.getId(), type_name='Software Package') + f = getattr(dest, obj.getId()) + title = obj.title or '' + description = obj.description or '' + subject = obj.Software_topics or [] + contact_email = obj.contact_email + f.setTitle(title) + f.setDescription(description) + f.setSubject(subject) + f.setContactEmail(contact_email) + return f def ProductRelease2CMFSoftwareRelease(self, obj, source, dest): - self.log('Ignoring Product Release for now.\n') - return None + dest.invokeFactory(id=obj.getId(), type_name='Software Release') + f = getattr(dest, obj.getId()) + title = obj.title or '' + version = obj.version + f.setTitle(title) + f.setVersion(version) + + f.invokeFactory(id=obj.getId(), type_name='Software Release File') + r = getattr(dest, obj.getId()) + platform = obj.platform + maturity = obj.status + info_url = obj.info_url + license_url = obj.license_url + changes_url = obj.changes_url + installation_url = obj.installation_url + license = obj.license + data, size = f._read_data(obj.data) + + r.update_data(data, content_type, size) + r.setPlatform(platform) + r.setMaturity(maturity) + r.setInfoURL(info_url) + r.setLicenseURL(license_url) + r.setChangesURL(changes_url) + r.setInstallationURL(installation_url) + r.setLicense(license) + + return f def Tracker2CMFCollector(self, obj, source, dest): self.log('Ignoring Tracker for now.\n') === Products/ZopeOrg-NV/Extensions/setupZopeOrg.py 1.59 => 1.60 === from Products.PluginIndexes.FieldIndex.FieldIndex import FieldIndex from Products.PluginIndexes.DateIndex.DateIndex import DateIndex +from Products.PluginIndexes.DateRangeIndex.DateRangeIndex import DateRangeIndex from Products.CMFDateIndexes.RSCatalogTool import RSCatalogTool from Products.BTreeFolder2.CMFBTreeFolder import manage_addCMFBTreeFolder @@ -38,6 +39,7 @@ , 'CMFCore' , 'CMFCalendar' , 'ZWiki' + , 'CMFPackage' , 'BackTalk' , 'CMFBackTalk' , 'DCWorkflow' @@ -85,6 +87,11 @@ , 'module' : 'ZWiki.cmf_install_zwiki' , 'function' : 'install' } + , { 'id' : 'ZO_setupCMFPackage' + , 'title' : 'Set up CMFPackage product' + , 'module' : 'CMFPackage.Install' + , 'function' : 'install' + } , { 'id' : 'ZO_NZOMigrate' , 'title' : 'Migrate script for NZO' , 'module' : 'ZopeOrg.NZOMigrate' @@ -233,23 +240,6 @@ # if string.find( log_line, ' ' ) != -1: # log.append( log_line ) - # Prune the addable types visible in CMF Folders - log.append( '\n * Pruning addable types in folder add list' ) - types_tool = getattr( portal, 'portal_types' ) - folder_type = getattr( types_tool, 'Folder' ) - all_types = types_tool.objectIds() - - for type in INVISIBLE_TYPES: - if type in all_types: - del all_types[all_types.index( type )] - log.append( ' - removed type "%s"' % type ) - - folder_type._updateProperty( id='filter_content_types' - , value=0 - ) - folder_type._updateProperty( id='allowed_content_types' - , value=all_types - ) # Create all the extra directories we need #log.append('\n * Creating default folder structure') @@ -268,6 +258,14 @@ log_list[i] = ' - %s' % log_list[i] log.extend( log_list ) + # Run the CMFPackage install script + log.append( '\n * Executing the CMFPackage install script' ) + log_str = portal.ZO_setupCMFPackage() + log_list = string.split( log_str, '\n' ) + for i in range( len( log_list ) ): + log_list[i] = ' - %s' % log_list[i] + log.extend( log_list ) + # Run the CMFCalendar install script log.append('\n * Executing CMFCalendar install script') log_str = portal.installCMFCalendar() @@ -285,10 +283,42 @@ log.extend(log_list) log.append('\n * Modifying allowed/filtered types for folderish types') - folderish_types=['Wiki Folder', 'Software Product', + folderish_types=['Wiki Folder', 'Software Package', 'Software Release', 'Member Folder'] setupAllowedTypes(portal, folderish_types) + # Prune the addable types visible in CMF Folders + log.append( '\n * Pruning addable types in folder add list' ) + types_tool = getattr( portal, 'portal_types' ) + folder_type = getattr( types_tool, 'Folder' ) + all_types = types_tool.objectIds() + + for type in INVISIBLE_TYPES: + if type in all_types: + invisible_type = getattr( types_tool, type ) + invisible_type._updateProperty( id='global_allow' + , value=0 + ) + del all_types[all_types.index( type )] + log.append( ' - removed type "%s"' % type ) + + folder_type._updateProperty( id='filter_content_types' + , value=0 + ) + folder_type._updateProperty( id='allowed_content_types' + , value=all_types + ) + + # The same to Wiki Folder if present. + if 'Wiki Folder' in all_types: + wf_type = getattr( types_tool, 'Wiki Folder' ) + wf_type._updateProperty( id='filter_content_types' + , value=0 + ) + wf_type._updateProperty( id='allowed_content_types' + , value=all_types + ) + # The roster shit is dangerous. we remove it here. mem_folder = getattr( portal, 'Members' ) if 'index_html' in mem_folder.objectIds(): @@ -697,7 +727,7 @@ """ tt = getToolByName(portal, 'portal_types') typesList = tt.listTypeInfo() - pdTypes = ['Document', 'Favorite', 'Link', 'News Item', 'File', 'Tip', 'HowTo', 'Software Product', 'Software Release', 'Software Release File'] + pdTypes = ['Document', 'Favorite', 'Link', 'News Item', 'File', 'Tip', 'HowTo', 'Software Package', 'Software Release', 'Software Release File'] for i in typesList: new_actions = [] for dict in i._actions: From sidnei at x3ng.com.br Wed Dec 4 14:45:50 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - SoftwareProduct.py:1.27 ZopeOrgTypes.py:1.4 __init__.py:1.17 Message-ID: <200212041945.gB4Jjof17609@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV In directory cvs.zope.org:/tmp/cvs-serv17579 Modified Files: SoftwareProduct.py ZopeOrgTypes.py __init__.py Log Message: Removed ZopeOrg Software Package for now. We will move it to a separate package later. === Products/ZopeOrg-NV/SoftwareProduct.py 1.26 => 1.27 === RATE_PERMISSION = 'Rate software products' PLATFORMS = ('Unix/Linux', 'Windows', 'Other', 'All', 'Unspecified') MATURITIES = ('Development', 'Stable') -ZOPE_VERSIONS=('NA', '1.X', '2.0', '2.1', '2.2', '2.3', '2.4')#get rid of this +ZOPE_VERSIONS=('NA', '1.X', '2.0', '2.1', '2.2', '2.3', '2.4', '2.5', '2.6', '3')#get rid of this PUBLIC_PRODUCT_TYPES=( 'Commerce', 'Content Object', 'Examples', 'External Access', 'Feedback', 'Helpers', 'Internationalization', === Products/ZopeOrg-NV/ZopeOrgTypes.py 1.3 => 1.4 === # from Products.CMFCore import CMFCorePermissions -from SoftwareProduct import factory_type_information -sp_ftis = tuple( map( lambda x: (x,), factory_type_information ) ) - -ftis = sp_ftis + ( +ftis = ( ( { 'id' : 'HowTo' , 'meta_type' : 'Document' === Products/ZopeOrg-NV/__init__.py 1.16 => 1.17 === from Products.CMFCore.utils import registerIcon, ToolInit, ContentInit from Products.CMFCore.CMFCorePermissions import AddPortalContent from Products.CMFCore import PortalFolder -import SoftwareProduct +#import SoftwareProduct import NewsItemWorkflow import ZopeOrgWorkflow #import ZopeOrgMemberDataTool @@ -23,7 +23,7 @@ registerDirectory('skins/zopeorg', globals()) registerDirectory('skins/zopeorg_membership', globals()) -ftis = SoftwareProduct.factory_type_information +#ftis = SoftwareProduct.factory_type_information CL_CTORS = ( ( 'manage_addContentListForm', ContentList.addContentListForm ) , ContentList.addContentList @@ -54,15 +54,15 @@ # product_name='ZopeOrg', # icon='tool.gif' ).initialize( context ) - ContentInit( - 'Zope.org Content', - content_types = ( SoftwareProduct.SoftwareProduct - , SoftwareProduct.SoftwareRelease - ), - permission = AddPortalContent, - extra_constructors = ( SoftwareProduct.addSoftwareProduct - , SoftwareProduct.addSoftwareRelease - , SoftwareProduct.addSoftwareReleaseFile - ), - fti = ftis , - ).initialize(context) + #ContentInit( + # 'Zope.org Content', + # content_types = ( SoftwareProduct.SoftwareProduct + # , SoftwareProduct.SoftwareRelease + # ), + # permission = AddPortalContent, + # extra_constructors = ( SoftwareProduct.addSoftwareProduct + # , SoftwareProduct.addSoftwareRelease + # , SoftwareProduct.addSoftwareReleaseFile + # ), + # fti = ftis , + # ).initialize(context) From sidnei at x3ng.com.br Fri Dec 27 15:08:46 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.3 Message-ID: <200212272008.gBRK8k021600@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/Extensions In directory cvs.zope.org:/tmp/cvs-serv21586/Extensions Modified Files: NZOMigrate.py Log Message: Fixed Software Package migration and a few other bits === Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.2 => 1.3 === return res +def massPublish(self): + wf_tool = getToolByName(self, 'portal_workflow') + if hasattr(self, 'objectValues'): + for subob in self.objectValues(): + try: wf_tool.doActionFor(subob, 'publish') + except: pass + massPublish(subob) + class Transmutator: def __init__(self, source, dest, ignore_path, type_map): @@ -197,6 +205,9 @@ return f def ProductRelease2CMFSoftwareRelease(self, obj, source, dest): + if obj.getId() == 'Zope-2.5.x-to-2.5.1-linux2-x86.tgz': + import pdb + pdb.set_trace() dest.invokeFactory(id=obj.getId(), type_name='Software Release') f = getattr(dest, obj.getId()) title = obj.title or '' @@ -205,7 +216,7 @@ f.setVersion(version) f.invokeFactory(id=obj.getId(), type_name='Software Release File') - r = getattr(dest, obj.getId()) + r = getattr(f, obj.getId()) platform = obj.platform maturity = obj.status info_url = obj.info_url @@ -213,8 +224,10 @@ changes_url = obj.changes_url installation_url = obj.installation_url license = obj.license - data, size = f._read_data(obj.data) - + data, size = obj._read_data(obj.data) + content_type = obj._get_content_type(obj.data, data, obj.__name__, + 'application/octet-stream') + r.update_data(data, content_type, size) r.setPlatform(platform) r.setMaturity(maturity) From sidnei at x3ng.com.br Sat Dec 28 07:53:06 2002 From: sidnei at x3ng.com.br (Sidnei da Silva) Date: Sun Aug 10 17:02:09 2008 Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - macro_renderer.html:1.1 standard_html_footer.dtml:1.1 standard_html_header.dtml:1.1 index_html.html:1.2 main_template.html:1.13 Message-ID: <200212281253.gBSCr6g29552@cvs.baymountain.com> Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo In directory cvs.zope.org:/tmp/cvs-serv29529 Modified Files: index_html.html main_template.html Added Files: macro_renderer.html standard_html_footer.dtml standard_html_header.dtml Log Message: Share the skin with dtml objects === Added File Products/ZopeOrg-NV/skins/nzo/macro_renderer.html ===
=== Added File Products/ZopeOrg-NV/skins/nzo/standard_html_footer.dtml === === Added File Products/ZopeOrg-NV/skins/nzo/standard_html_header.dtml ===
  === Products/ZopeOrg-NV/skins/nzo/index_html.html 1.1 => 1.2 ===
+ + + + Locally defined HTML @@ -15,6 +15,14 @@ tal:attributes="href item/absolute_url" tal:content="item/title_or_id" class="bTitle">Title
Description + + +
+
+ + + +/span>
=== Products/ZopeOrg-NV/skins/nzo/main_template.html 1.12 => 1.13 === workflow_actions actions/workflow; "> - + New Zope.org @@ -40,8 +40,9 @@ - + +
@@ -60,9 +61,7 @@
- + tal:attributes="action string:${portal_url}/search">   @@ -97,12 +96,12 @@
- +
-
+

About Zope

@@ -157,12 +156,15 @@
  +
Byline
+ +
@@ -296,6 +298,7 @@
+