From sidnei at x3ng.com.br  Mon Jun  2 07:18:12 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.28
Message-ID: <200306021118.h52BIC221928@cvs.baymountain.com>

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

Modified Files:
	NZOMigrate.py 
Log Message:
Fix ZWikiPages while copying over.

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.27 => 1.28 ===
 
     def ZWikiPage2ZWikiPage(self, obj, source, dest):
         obj = self.defaultMigrationMethod(obj, source, dest)
+        # ZWikiPages originally did not inherit from DublinCore, now they do,
+        # so we take our time to initialize DublinCore while copying over.
+        DefaultDublinCoreImpl.__init__(obj)
         return obj
 
     def ZCatalog2ZCatalog(self, obj, source, dest):
@@ -1174,7 +1177,7 @@
                 if self._debug:
                     import pdb
                     pdb.set_trace()
-                
+
                 try:
                     __traceback_info__ = (obj_url, obj.__class__.__name__, obj, source, dest)
                     new_objs = mm(obj, source, dest)



From sidnei at x3ng.com.br  Mon Jun  2 07:23:06 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.29
Message-ID: <200306021123.h52BN6722610@cvs.baymountain.com>

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

Modified Files:
	NZOMigrate.py 
Log Message:
Avoid clashes with method names

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.28 => 1.29 ===
         dest = self._dest
         ignore = self._ignore_path
         source_id = source.getId()
-        if not hasattr(aq_base(dest), 'meta_type') or \
-               not hasattr(aq_base(dest), 'objectIds'):
-            # maybe-not-object. eg: we acquired the 'view' method
-            self.log('Destination is invalid. %r \n' % dest)
-            return 'Ok.\n'
         if hasattr(source, 'objectIds') and \
                hasattr(source, 'getPhysicalPath'):
             path = source.getPhysicalPath()
@@ -1199,6 +1194,11 @@
                     new_objs = (new_objs, )
 
                 for new_obj in new_objs:
+                    if not hasattr(aq_base(new_obj), 'meta_type'):
+                        # maybe-not-object. eg: we acquired the 'view' method
+                        self.log('New object is invalid. Probably acquired by mistake. %r.\n' % new_obj)
+                        continue
+                    
                     if new_obj is None:
                         self.log('Invalid object found when migrating: %s.\n' % obj_url)
                         continue



From sidnei at x3ng.com.br  Mon Jun  2 17:19:59 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.30
Message-ID: <200306022119.h52LJxv10661@cvs.baymountain.com>

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

Modified Files:
	NZOMigrate.py 
Log Message:
Fixes to allow cataloging

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.29 => 1.30 ===
 from ZODB.POSException import POSKeyError
 from Acquisition import aq_base, aq_parent, aq_inner
 from Products.CMFCore.WorkflowCore import WorkflowException
+from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCollector.CollectorIssue import CollectorIssue
 from DateTime import DateTime
@@ -21,11 +22,17 @@
                    'Tracker', 'Utilities', 'WikiCentral', 'projects', 'CatalogHelp', 'Help', \
                    'SiteAnnouncement', 'WhatIsZope', 'ZopeArchitecture', 'ZopeNews', 'privacy.html',
                    'Members']
+        migrate.sort()
+        migrate = migrate[migrate.index('Members'):]
         ignore_path = ['/%s' % o for o in source.objectIds() if o not in migrate]
     members_ignore = ['billqian', 'edward', 'epson', 'ltunes', 'michel', 'superuser', \
                       'myUnreviewed', 'mail_password_form', \
                       'mail_password_template', 'password_html', 'tim.kidder', 'update_html', \
                       'index_html']
+    mids = source.Members.objectIds()
+    mids.sort()
+    mids = mids[:mids.index('ewilliams')]
+    members_ignore.extend(mids)
     dont_migrate = ['/Members/%s' % o for o in members_ignore]
     ignore_path.extend(dont_migrate)
     if exceptions is None:
@@ -168,13 +175,8 @@
                                               username=username,
                                               assignees=assignees)
         except WorkflowException:
-            action = 'new_issue'
-            issue.portal_workflow.doActionFor(issue,
-                                              action,
-                                              comment=comment,
-                                              username=username,
-                                              assignees=assignees)
-
+            pass # Leave as is. Probably pending.
+        
     new_status = issue.status().split('_')[0]
 
     transcript = issue.get_transcript()
@@ -774,11 +776,12 @@
         return None
 
     def ZWikiPage2ZWikiPage(self, obj, source, dest):
-        obj = self.defaultMigrationMethod(obj, source, dest)
         # ZWikiPages originally did not inherit from DublinCore, now they do,
         # so we take our time to initialize DublinCore while copying over.
         DefaultDublinCoreImpl.__init__(obj)
-        return obj
+        get_transaction().commit()
+        new_obj = self.defaultMigrationMethod(obj, source, dest)
+        return new_obj
 
     def ZCatalog2ZCatalog(self, obj, source, dest):
         self.log('Ignoring ZCatalog for now.\n')



From sidnei at x3ng.com.br  Mon Jun  2 17:20:29 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - __init__.py:1.24
Message-ID: <200306022120.h52LKTI10804@cvs.baymountain.com>

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

Modified Files:
	__init__.py 
Log Message:
Fixes to allow cataloging

=== Products/ZopeOrg-NV/__init__.py 1.23 => 1.24 ===
 import ZopeServiceProvider
 import ZopeOrgTypes
 import ZPublisher.Publish
+import zLOG
+
+def log(message, summary='', severity=0, dup=1):
+    zLOG.LOG('ZopeOrg: ',severity,summary,message)
 
 #Hackish workaround to allow accesing the broken ZODB on ZopeOrg
 class ImplicitAcquirerWrapper:
@@ -20,6 +24,28 @@
 from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
 DefaultDublinCoreImpl._DefaultDublinCoreImpl__FLOOR_DATE   = DateTime(1979, 0)
 DefaultDublinCoreImpl._DefaultDublinCoreImpl__CEILING_DATE = DateTime(2979, 0)
+
+def SearchableText(self):
+    """ Used by the catalog for basic full text indexing """
+    if not callable(self.Title):
+        log('Title should be method, found %s at %s .\n' % (type(self.Title), \
+                                                            self.absolute_url(relative=1)))
+    if not callable(self.Description):
+        log('Description should be method, found %s at %s .\n' % (type(self.Description), \
+                                                            self.absolute_url(relative=1)))
+    if not callable(self.EditableBody):
+        log('EditableBody should be method, found %s at %s .\n' % (type(self.EditableBody), \
+                                                            self.absolute_url(relative=1)))
+    title = callable(self.Title) and self.Title() or self.Title
+    description = callable(self.Description) and self.Description() or self.Description
+    body = callable(self.EditableBody) and self.EditableBody() or self.EditableBody
+    return "%s %s %s" % ( title
+                          , description
+                          , body
+                          )
+
+from Products.CMFDefault.Document import Document
+Document.SearchableText = SearchableText
 
 Acquisition.ImplicitAcquirerWrapper = ImplicitAcquirerWrapper
 ZPublisher.Publish.rfind = rfind



From sidnei at x3ng.com.br  Mon Jun 16 16:04:41 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources Products/ZopeOrg-NV/skeleton/Resources - New directory
Message-ID: <200306162004.h5GK4fx10051@cvs.baymountain.com>

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

Log Message:
Directory /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources added to the repository

=== Added directory Products/ZopeOrg-NV/skeleton/Resources ===



From sidnei at x3ng.com.br  Mon Jun 16 16:05:05 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/CaseStudies Products/ZopeOrg-NV/skeleton/Resources/CaseStudies - New directory
Message-ID: <200306162005.h5GK55310202@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/CaseStudies
In directory cvs.zope.org:/tmp/cvs-serv10191/Resources/CaseStudies

Log Message:
Directory /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/CaseStudies added to the repository

=== Added directory Products/ZopeOrg-NV/skeleton/Resources/CaseStudies ===



From sidnei at x3ng.com.br  Mon Jun 16 16:05:32 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/ZSP Products/ZopeOrg-NV/skeleton/Resources/ZSP - New directory
Message-ID: <200306162005.h5GK5WG10226@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/ZSP
In directory cvs.zope.org:/tmp/cvs-serv10215/Resources/ZSP

Log Message:
Directory /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/ZSP added to the repository

=== Added directory Products/ZopeOrg-NV/skeleton/Resources/ZSP ===



From sidnei at x3ng.com.br  Mon Jun 16 16:05:40 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/CaseStudies - index_html.cl:1.1
Message-ID: <200306162005.h5GK5e610254@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/CaseStudies
In directory cvs.zope.org:/tmp/cvs-serv10233/Resources/CaseStudies

Added Files:
	index_html.cl 
Log Message:
Adding content listing skeleton

=== Added File Products/ZopeOrg-NV/skeleton/Resources/CaseStudies/index_html.cl ===
Title: 
Subject: 
Publisher: No publisher
Description: 
Contributors: 
Effective_date: None
Expiration_date: None
Type: Content List
Format: text/html
Language: 
Rights: 

[macros]
listing = here/nzo_listing_macros/macros/case_study
footer = 
header = 

[default]
result_source = catalog
limit = 0
allowed_types = Case Study
sort_order = asc
sort_key = Date




From sidnei at x3ng.com.br  Mon Jun 16 16:05:40 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/ZSP - index_html.cl:1.1
Message-ID: <200306162005.h5GK5eS10260@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/ZSP
In directory cvs.zope.org:/tmp/cvs-serv10233/Resources/ZSP

Added Files:
	index_html.cl 
Log Message:
Adding content listing skeleton

=== Added File Products/ZopeOrg-NV/skeleton/Resources/ZSP/index_html.cl ===
Title: 
Subject: 
Publisher: No publisher
Description: 
Contributors: 
Effective_date: None
Expiration_date: None
Type: Content List
Format: text/html
Language: 
Rights: 

[macros]
listing = here/nzo_listing_macros/macros/zope_service_provider
footer = 
header = 

[default]
result_source = container
limit = 0
allowed_types = Zope Service Provider
sort_order = asc
sort_key = Title




From sidnei at x3ng.com.br  Mon Jun 16 16:15:38 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:13 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.31
Message-ID: <200306162015.h5GKFcv11606@cvs.baymountain.com>

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

Modified Files:
	NZOMigrate.py 
Log Message:
Changing default username

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.30 => 1.31 ===
         return
 
     action_number = issue.action_number = issue.action_number + 1
-    username = 'admin'
+    username = 'nzo_migration_tool'
 
     orig_supporters = issue.assigned_to()
     orig_status = issue.status().split('_')[0]



From sidnei at x3ng.com.br  Mon Jun 16 16:32:43 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.32 synchronizeSkeleton.py:1.30
Message-ID: <200306162032.h5GKWhX14115@cvs.baymountain.com>

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

Modified Files:
	NZOMigrate.py synchronizeSkeleton.py 
Log Message:
Improving migration and skeleton sync

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.31 => 1.32 ===
                                               assignees=assignees)
         except WorkflowException:
             pass # Leave as is. Probably pending.
-        
+
     new_status = issue.status().split('_')[0]
 
     transcript = issue.get_transcript()
@@ -381,7 +381,7 @@
     udb = None
     if new_uid != uid:
         while p is not None:
-            if hasattr(p, 'acl_users'):
+            if hasattr(aq_base(p), 'acl_users'):
                 acl_users = getattr(p, 'acl_users')
                 try:
                     user = acl_users.getUserById(new_uid).__of__(acl_users)
@@ -391,7 +391,7 @@
                     # Found the right database.
                     udb = acl_users.getPhysicalPath()[1:]
                     break
-                p = aq_parent(aq_inner(p))
+            p = aq_parent(aq_inner(p))
         if udb is not None:
             ob.changeOwnership(user)
             #log('Changed ownership of %s from %s!%s to %s!%s.\n' %
@@ -1141,6 +1141,7 @@
         dest = self._dest
         ignore = self._ignore_path
         source_id = source.getId()
+        p_cat = getToolByName(dest, 'portal_catalog')
         if hasattr(source, 'objectIds') and \
                hasattr(source, 'getPhysicalPath'):
             path = source.getPhysicalPath()
@@ -1151,6 +1152,9 @@
                 oids.remove('acl_users')
                 oids.insert(0, 'acl_users')
             for oid in oids:
+                if oid in p_cat.schema() or oid in p_cat.indexes():
+                    self.log('Oid %s at %s conflicts with catalog schema or index name.\n' % (oid, '/'.join(path)))
+                    continue
                 obj_path = list(path[:])
                 obj_path.append(oid)
                 obj_url = '/'.join(obj_path)
@@ -1201,7 +1205,7 @@
                         # maybe-not-object. eg: we acquired the 'view' method
                         self.log('New object is invalid. Probably acquired by mistake. %r.\n' % new_obj)
                         continue
-                    
+
                     if new_obj is None:
                         self.log('Invalid object found when migrating: %s.\n' % obj_url)
                         continue


=== Products/ZopeOrg-NV/Extensions/synchronizeSkeleton.py 1.29 => 1.30 ===
                                       , comment=''
                                        )
             obj.reindexObject()
+        elif f_ext == '.cl':
+            container_obj.invokeFactory(id=f_name, type_name='Content List')
+            obj = getattr(container_obj, f_name)
+            from Products.CMFContentList.tests.test_getput import FakeRequest, FakeResponse
+            obj.PUT(FakeRequest({'BODY':f_data}), FakeResponse())
+            wf_tool = getattr(container_obj, 'portal_workflow')
+            wf_objs = wf_tool.getWorkflowsFor(obj)
+            for wf_obj in wf_objs:
+                wf_obj.setReviewStateOf(ob=obj
+                                      , review_state='published'
+                                      , action='publish'
+                                      , comment=''
+                                       )
+            obj.reindexObject()
 
 
 def _getProps( path ):



From sidnei at x3ng.com.br  Mon Jun 16 17:08:17 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - nzo_listing_macros.pt:1.1 index_html.pt:1.2
Message-ID: <200306162108.h5GL8HT22200@cvs.baymountain.com>

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

Modified Files:
	index_html.pt 
Added Files:
	nzo_listing_macros.pt 
Log Message:
Added listing macros from dev.nzo

=== Added File Products/ZopeOrg-NV/skins/nzo/nzo_listing_macros.pt ===
<html>
  <head>
    <title tal:content="template/title">The title</title>
  </head>
  <body>
    <div metal:define-macro="zope_service_provider">
    <table width="95%">
      <tr>
	<td width="60%">
    <img src="logo.jpg"
         tal:condition="here/getLogo"
         tal:attributes="src python:here.getLogo().absolute_url();
                         alt python:here.Company()" />

    <strong tal:condition="not:here/getLogo"
	    tal:content="here/Company/strip|here/getId">Company</strong>

    <p>
      <span tal:condition="here/ExternalURL">
       <a href="#" tal:attributes="href here/ExternalURL">
          Website
      </a>
      -
     </span>
     <a href="#" tal:attributes="href here/absolute_url">
       Company profile
     </a>
   </p>

   </td>
   <td>
      <span tal:condition="here/Location"
            tal:omit-tag="">
      <strong>Location:</strong><br />
      <span tal:replace="here/Location" /><br /><br />
      </span>
      <span tal:condition="here/ServiceInfo"
            tal:omit-tag="">
      <strong>Service Info:</strong><br />
      <span tal:replace="structure here/ServiceInfo" />
      </span>
   </td>
   </tr>
   </table>
    <hr />
   </div>

   <div metal:define-macro="case_study">
    <table width="95%">
      <tr>
	<td width="60%">

    <p tal:condition="here/ExternalURL|nothing">
       <a href="#" tal:attributes="href here/ExternalURL"
	           tal:content="here/ExternalURL">
          Website
      </a>
   </p>

    <span tal:condition="here/Summary|nothing"
	    tal:content="structure here/Summary">Summary</span>

     <a href="#" tal:attributes="href here/absolute_url">
       Read More...
     </a>

	</td>
   </tr>
   </table>
    <hr />
   </div>
</body>
</html>


=== Products/ZopeOrg-NV/skins/nzo/index_html.pt 1.1 => 1.2 ===
 </span>
 <span metal:use-macro="here/local_html/macros/body|default">Locally defined HTML</span>
         <table tal:condition="python: 'local_html' not in here.objectIds()"
-               tal:define="raw_items python: here.contentValues();
-                        sort_items python: raw_items.sort(lambda a, b: cmp(a.getId(), b.getId()) );
-                        items python: here.ZPT_skip_unauthorized( raw_items )">
+               tal:define="items python: here.contentValues();
+                        sort_items python: items.sort(lambda a, b: cmp(a.getId(), b.getId()) )">
             <tr tal:repeat="item items">
                 <td colspan="2"><a href="item_url" 
                     tal:attributes="href item/absolute_url" tal:content="item/title_or_id" class="bTitle">Title</a>



From sidnei at x3ng.com.br  Mon Jun 16 17:10:15 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/zopeorg_types - zsp_edit_form.pt:1.2
Message-ID: <200306162110.h5GLAFs22508@cvs.baymountain.com>

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

Modified Files:
	zsp_edit_form.pt 
Log Message:
One error in form action

=== Products/ZopeOrg-NV/skins/zopeorg_types/zsp_edit_form.pt 1.1 => 1.2 ===
 <div metal:fill-slot="main">
 
    <h2>Edit <span tal:replace="here/id">This</span></h2>
-   
-   <form action="zsp_edit" method="post" enctype="multipart/form-data">
+
+   <form action="zsp_edit" method="post" enctype="multipart/form-data"
+         tal:attributes="action string:${here/absolute_url}/zsp_edit">
     <input type="hidden" name="SafetyBelt"
            tal:attributes="value here/SafetyBelt">
     <table>



From sidnei at x3ng.com.br  Mon Jun 16 17:10:44 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - synchronizeSkeleton.py:1.31
Message-ID: <200306162110.h5GLAiD22514@cvs.baymountain.com>

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

Modified Files:
	synchronizeSkeleton.py 
Log Message:
One error in form action

=== Products/ZopeOrg-NV/Extensions/synchronizeSkeleton.py 1.30 => 1.31 ===
             fs_file = os.path.join( skel_path, elem_path )
             (elem_id, elem_ext) = os.path.splitext( elem )
 
-            if hasattr( aq_base( cur_obj ), elem_id ):
+            __traceback_info__ = (fs_file, elem)
+            if hasattr( aq_base( cur_obj ), elem_id ) and getattr(cur_obj, elem_id) is not None:
                 if not os.path.isdir( fs_file ):
                     cur_obj._delObject( elem_id )
                 else:
@@ -66,11 +67,11 @@
                                    , description=prop_dict.get( 'description', '' )
                                    )
 
-            if not hasattr( aq_base( cur_obj ), elem_id ):
+            if not hasattr( aq_base( cur_obj ), elem_id ) or getattr(cur_obj, elem_id) is None:
                 _createObject( cur_obj, path )
-            
+
             cur_obj = getattr( cur_obj, elem_id )
-    
+
     return string.join( log, '\n' )
 
 
@@ -92,13 +93,13 @@
     f_name, f_ext = os.path.splitext( os.path.split( path )[1] )
 
     if os.path.isdir( path ):
-        container_obj.manage_addPortalFolder( f_name )
+        container_obj.manage_addPloneFolder( f_name )
         prop_dict = _getProps( path )
         folder_obj = getattr( container_obj, f_name )
         folder_obj.edit( title=prop_dict.get( 'title', '' )
                        , description=prop_dict.get( 'description', '' )
                        )
-                
+
     else:
         f_handle = open( path, 'r' )
         f_data = f_handle.read()
@@ -110,11 +111,10 @@
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
         elif f_ext == '.ps' or f_ext == '.py':
             py_obj = PythonScript( id=f_name )
             py_obj.write( f_data )
@@ -152,13 +152,12 @@
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
             obj.reindexObject()
-            
+
         elif f_ext == '.link':
             link_dict = eval(f_data)
             container_obj.invokeFactory(id=f_name
@@ -171,11 +170,10 @@
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
             obj.reindexObject()
 
         elif f_ext == '.html':
@@ -185,15 +183,14 @@
             h, b, f = obj.handleText(f_data, format="html")
             obj.setMetadata(h)
             obj._edit(text=b)
-            
+
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
             obj.reindexObject()
         elif f_ext == '.cl':
             container_obj.invokeFactory(id=f_name, type_name='Content List')
@@ -203,11 +200,10 @@
             wf_tool = getattr(container_obj, 'portal_workflow')
             wf_objs = wf_tool.getWorkflowsFor(obj)
             for wf_obj in wf_objs:
-                wf_obj.setReviewStateOf(ob=obj
-                                      , review_state='published'
-                                      , action='publish'
-                                      , comment=''
-                                       )
+                wf_obj.doActionFor(ob=obj
+                                   , action='publish'
+                                   , comment=''
+                                   )
             obj.reindexObject()
 
 



From sidnei at x3ng.com.br  Thu Jun 26 20:05:26 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.33
Message-ID: <200306270005.h5R05QH11377@cvs.baymountain.com>

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

Modified Files:
	NZOMigrate.py 
Log Message:
Small reordering

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.32 => 1.33 ===
                         continue
 
                     try:
-                        new_obj = fixOwnership(obj, new_obj)
+                        new_obj = copyProperties(obj, new_obj)
                     except:
                         self.log(pretty_exc(sys.exc_info()))
 
                     try:
-                        new_obj = copyProperties(obj, new_obj)
+                        massPublish(new_obj, 0)
                     except:
                         self.log(pretty_exc(sys.exc_info()))
 
-                    res = []
                     try:
-                        res = _cleanupOwnership(new_obj, res, 0)
-                        if res != []:
-                            self.log('\n'.join(res) + '\n')
+                        new_obj = fixOwnership(obj, new_obj)
                     except:
                         self.log(pretty_exc(sys.exc_info()))
 
+                    res = []
                     try:
-                        massPublish(new_obj, 0)
+                        res = _cleanupOwnership(new_obj, res, 0)
+                        if res != []:
+                            self.log('\n'.join(res) + '\n')
                     except:
                         self.log(pretty_exc(sys.exc_info()))
 
@@ -1241,9 +1241,9 @@
                                               self._exceptions, \
                                               self._count, debug=self._debug).run(), dup=0)
 
-                        #if source_id == 'Members':
-                        #    res = recursiveOwnerFix(new_obj, oid, 1)
-                        #    setLocalRoles(new_obj, (oid, ), 'Owner', obj_url)
+                        if source_id == 'Members':
+                            res = recursiveOwnerFix(new_obj, oid, 1)
+                            setLocalRoles(new_obj, (oid, ), 'Owner', obj_url)
 
                     try:
                         new_obj = fixModificationDate(obj, new_obj)



From sidnei at x3ng.com.br  Fri Jun 27 07:37:50 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: NZO_SiteLayout - buildout_zope_sandbox:1.13
Message-ID: <200306271137.h5RBboI12743@cvs.baymountain.com>

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv12729

Modified Files:
	buildout_zope_sandbox 
Log Message:
Dont create Extensions dir. We are checking it out from cvs.

=== NZO_SiteLayout/buildout_zope_sandbox 1.12 => 1.13 ===
 #
 if [ "$ZOPE_VERSION" == "2.6.1" -o "$ZOPE_VERSION" == "2.6-branch" ]; then
     cd $vardir
-    mkdir -p zope/var zope/Products zope/import zope/Extensions
+    mkdir -p zope/var zope/Products zope/import #zope/Extensions
     #echo Creating initial "manager" account.
     #$bindir/python $optdir/Zope/zpasswd.py $vardir/zope/inituser
 else



From sidnei at x3ng.com.br  Sat Jun 28 10:19:08 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - __init__.py:1.1
Message-ID: <200306281419.h5SEJ8T02846@cvs.baymountain.com>

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

Added Files:
	__init__.py 
Log Message:
Replace MemberData and Membership Tool at creation time

=== Added File Products/ZopeOrg-NV/Extensions/__init__.py ===



From sidnei at x3ng.com.br  Sat Jun 28 10:19:40 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV - Installer.py:1.4
Message-ID: <200306281419.h5SEJe002865@cvs.baymountain.com>

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

Modified Files:
	Installer.py 
Log Message:
Replace MemberData and Membership Tool at creation time

=== Products/ZopeOrg-NV/Installer.py 1.3 => 1.4 ===
 
 from Products.ZopeOrg import zopeorg_globals
 from Products.ZopeOrg.ZopeOrgTypes import ftis
+from Products.ZopeOrg.Extensions.NZOMigrate import copyProperties
 
 from Products.ZCTextIndex import ZCTextIndex
 from Products.PluginIndexes.DateIndex.DateIndex import DateIndex
@@ -20,7 +21,8 @@
 from Products.ExternalMethod.ExternalMethod import ExternalMethod
 
 from Products.QueueCatalog import QueueCatalog
-
+from Products.CMFLDAP.PloneLDAPMembershipTool import PloneLDAPMembershipTool
+from Products.CMFLDAP.LDAPMemberDataTool import LDAPMemberDataTool
 
 def register(context, app_state):
     addPolicy('Zope.org Policy', ZopeOrgPolicy())
@@ -173,6 +175,12 @@
         self.log('Replacing Portal Catalog Tool with QueueCatalog....')
         self.replaceCatalogTool(portal)
 
+        self.log('Replacing Portal Membership Tool with LDAP version....')
+        self.replaceMembershipTool(portal)
+
+        self.log('Replacing Portal MemberData Tool with LDAP version....')
+        self.replaceMemberDataTool(portal)
+
         self.log('Modifying Catalog Indexes and Metadata....')
         self.catalogAddEffectiveRange(portal)
         self.catalogAddIndexes(portal)
@@ -430,6 +438,39 @@
         portal._objects = objmap
 
         self.log(' - Replaced Portal Catalog tool with QueueCatalog')
+
+    def replaceMembershipTool(self, portal):
+        """Replace the membership tool if necessary"""
+        p_member = getattr(portal, 'portal_membership')
+
+        if isinstance(p_member, PloneLDAPMembershipTool):
+            self.log(' - Portal Membership tool already LDAP-ized')
+            return
+
+        actions = p_member._cloneActions()
+        portal.manage_delObjects(ids=('portal_membership'))
+        portal.manage_addProduct['CMFLDAP'].manage_addTool('Plone LDAP Membership Tool', None)
+        p_member = getattr(portal, 'portal_membership')
+        p_member._actions = tuple(actions)
+
+        self.log(' - Replaced Membership tool with LDAP-ized version')
+
+    def replaceMemberDataTool(self, portal):
+        """Replace the memberdata tool if necessary"""
+        p_data = getattr(portal, 'portal_memberdata')
+
+        if isinstance(p_data, LDAPMemberDataTool):
+            self.log(' - Portal MemberData tool already LDAP-ized')
+            return
+
+        actions = p_data._cloneActions()
+        portal.manage_delObjects(ids=('portal_memberdata'))
+        portal.manage_addProduct['CMFLDAP'].manage_addTool('LDAP Member Data Tool', None)
+        new = getattr(portal, 'portal_memberdata')
+        new._actions = tuple(actions)
+        copyProperties(p_data, new)
+
+        self.log(' - Replaced MemberData tool with LDAP-ized version')
 
     def catalogAddIndexes(self, portal):
         """ Add Indexes to the portal catalog """



From sidnei at x3ng.com.br  Sat Jun 28 15:42:48 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - frontpage_menu_items.properties:1.1 index_html.properties:1.1 news.rss.properties:1.1 news.rss.pt:1.1 ploneCustom.css.properties:1.1 products.rss.properties:1.1 products.rss.pt:1.1 xml.gif:1.1 xml.gif.properties:1.1 frontpage_menu_items.py:1.2 ploneCustom.css.dtml:1.2
Message-ID: <200306281942.h5SJgmO18871@cvs.baymountain.com>

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

Modified Files:
	frontpage_menu_items.py ploneCustom.css.dtml 
Added Files:
	frontpage_menu_items.properties index_html.properties 
	news.rss.properties news.rss.pt ploneCustom.css.properties 
	products.rss.properties products.rss.pt xml.gif 
	xml.gif.properties 
Log Message:
skin updates

=== Added File Products/ZopeOrg-NV/skins/nzo/frontpage_menu_items.properties ===
title:string=


=== Added File Products/ZopeOrg-NV/skins/nzo/index_html.properties ===
title:string=Zope Community


=== Added File Products/ZopeOrg-NV/skins/nzo/news.rss.properties ===
title:string=


=== Added File Products/ZopeOrg-NV/skins/nzo/news.rss.pt ===
<?xml version="1.0" ?>
<rss version="2.0"
     xmlns:tal="http://xml.zope.org/namespaces/tal"
     tal:define="p_url nocall:here/portal_url;
                 portal_url python:p_url();
                 portal python:p_url.getPortalObject();
                 p_props here/portal_properties;
                 site_props p_props/site_properties;
                 items python:here.latestContentBySubject(portal_type='News Item', max_items=7);">

  <channel>
    <title
        tal:content="python:portal.title_or_id()">
        Zope.org
    </title>
    <link tal:content="portal_url">http://www.zope.org</link>
    <language
        tal:content="site_props/default_language">
        it/it
    </language>
    <description
        tal:content="portal/description">
       News sito Zope Italia
    </description>

  <item
     tal:repeat="item items">
       <title tal:content="item/Title">
           Prima release di PloneAddressBook
       </title>
       <link tal:content="item/absolute_url">
             http://www.zope.org/Members/dreamcatcher
       </link>
       <description tal:content="item/Description">
         Provatelo ora !
       </description>
  </item>

  </channel>


</rss>


=== Added File Products/ZopeOrg-NV/skins/nzo/ploneCustom.css.properties ===
title:string=


=== Added File Products/ZopeOrg-NV/skins/nzo/products.rss.properties ===
title:string=


=== Added File Products/ZopeOrg-NV/skins/nzo/products.rss.pt ===
<?xml version="1.0" ?>
<rss version="2.0"
     xmlns:tal="http://xml.zope.org/namespaces/tal"
     tal:define="p_url nocall:here/portal_url;
                 portal_url python:p_url();
                 portal python:p_url.getPortalObject();
                 p_props here/portal_properties;
                 site_props p_props/site_properties;
                 items
		 python:here.latestContentBySubject(portal_type='Software Release', max_items=7);">

  <channel>
    <title
        tal:content="python:portal.title_or_id()">
        Zope.org
    </title>
    <link tal:content="portal_url">http://www.zope.org</link>
    <language
        tal:content="site_props/default_language">
        it/it
    </language>
    <description
        tal:content="portal/description">
       News sito Zope Italia
    </description>

  <item
     tal:repeat="item items">
       <title tal:content="item/Title">
           Prima release di PloneAddressBook
       </title>
       <link tal:content="item/absolute_url">
             http://www.zope.org/Members/dreamcatcher
       </link>
       <description tal:content="item/Description">
         Provatelo ora !
       </description>
  </item>

  </channel>


</rss>


=== Added File Products/ZopeOrg-NV/skins/nzo/xml.gif ===
  <Binary-ish file>

=== Added File Products/ZopeOrg-NV/skins/nzo/xml.gif.properties ===
title:string=
content_type:string=image/gif
precondition:string=


=== Products/ZopeOrg-NV/skins/nzo/frontpage_menu_items.py 1.1 => 1.2 ===
 subitems.append({'label':'What Is Zope?', 'url':'/WhatIsZope'})
 subitems.append({'label':'Roadmap', 'url':'/Roadmap'})
 subitems.append({'label':'News', 'url':'/news'})
-subitems.append({'label':'Awards', 'url':''})
-subitems.append({'label':'Getting Started', 'url':''})
+#subitems.append({'label':'Awards', 'url':''})
+#subitems.append({'label':'Getting Started', 'url':''})
 
 subitems=[]
 menu.append({'label':'Docs', 'url':'/Documentation', 'subitems':subitems})
 
 subitems.append({'label':'The Zope Book', 'url':'/Documentation/Books/ZopeBook/current'})
 subitems.append({'label':'Developer Guide', 'url':'/Documentation/Books/ZDG/current'})
-subitems.append({'label':'API reference', 'url':''})
+subitems.append({'label':'API reference', 'url':'/Members/michel/ZB/AppendixB.dtml'})
 subitems.append({'label':'ZPT reference', 'url':''})
-subitems.append({'label':'DTML reference', 'url':''})
+subitems.append({'label':'DTML reference', 'url':'/Members/michel/ZB/AppendixA.dtml'})
 subitems.append({'label':'Administrator Guide', 'url':'/Documentation/Guides/ZAG'})
 subitems.append({'label':'Articles', 'url':'/Resources/Articles'})
-subitems.append({'label':"How-To's", 'url':''})
+subitems.append({'label':"How-To's", 'url':'/Documentation/How-To'})
 subitems.append({'label':'Books in print', 'url':''})
 
 subitems=[]
@@ -69,6 +69,7 @@
 subitems.append({'label':'ZopeLabs', 'url':'http://www.zopelabs.com'})
 subitems.append({'label':'Zope Europe', 'url':'http://www.zope-europe.org'})
 subitems.append({'label':'OzZope', 'url':'http://www.ozzope.org'})
+subitems.append({'label':'Zope.it', 'url':'http://www.zope.it'})
 
 s = lambda x,y: cmp(x['label'], y['label'])
 menu.sort(s)


=== Products/ZopeOrg-NV/skins/nzo/ploneCustom.css.dtml 1.1 => 1.2 ===
   color: black;
 }
 
-p { 
+p {
   text-align: left;
   line-height: 1.4em;
 }
@@ -156,8 +156,8 @@
   padding: 0;
 }
 
-#searchGadget { 
-  width: 120px; 
+#searchGadget {
+  width: 120px;
 }
 
 div.personalBar {
@@ -243,7 +243,7 @@
 
 table.columns table.columns td.main{
     margin: 0;
-    padding: 0em 1em 0em 0em;                                     
+    padding: 0em 1em 0em 0em;
     border: none;
     width: 70%;
 }
@@ -283,7 +283,7 @@
     font-size:0.9em;
 }
 
-td.left div.box h5{ 
+td.left div.box h5{
     background: transparent;
     border: 1px solid #A0A0A0;
     border-style: none none solid none;
@@ -298,17 +298,29 @@
     height: 1em;
 }
 
-table.columns table.columns td.right div.box h5{ 
+table.columns table.columns td.right div.box h5{
   border-style: solid;
   color: white;
-  background-color: #336699; 
+  background-color: #336699;
   text-align: left;
-  padding: 0em 0em 0.3em 0.3em; 
-  display: block;                                                 
+  padding: 0em 0em 0.3em 0.3em;
+  display: block;
   text-transform: none;
 }
 
-table.columns table.columns td.right div.box div.body div.content{ 
+table.columns table.columns td.right div.box h5 a{
+  color: white;
+}
+
+table.columns table.columns td.right div.box h5 span{
+  float: left;
+}
+
+table.columns table.columns td.right div.box h5 img{
+  float: right;
+}
+
+table.columns table.columns td.right div.box div.body div.content{
     border: 0;
     padding: 0.5em;
     margin: 0;
@@ -316,7 +328,7 @@
 
 
 td.left div.box h6,
-td.right div.box h6 { 
+td.right div.box h6 {
     background: transparent;
     border: 1px solid #A0A0A0;
     border-style: none none solid none;
@@ -329,10 +341,10 @@
     height: 1em;
 }
 
-input.standalone, 
-input.context { 
+input.standalone,
+input.context {
      background: #EAEAEA;
-     margin-bottom: 1em; 
+     margin-bottom: 1em;
      padding: 0;
 }
 
@@ -343,22 +355,22 @@
 }
 
 input {
-   background: #EAEAEA; 
+   background: #EAEAEA;
    color: Black;
    font-weight: normal;
    text-transform: none;
 }
 
-ul { 
+ul {
   padding-bottom: 0.5em;
 }
 
-div.footer { 
+div.footer {
   margin: 0;
   padding: 0;
 }
 
-div.hilite { 
+div.hilite {
   color: #666666;
   font-style: italic;
   font-size: 110%;
@@ -393,4 +405,4 @@
 
 span.resultURL {
   color: #009900;
-}
\ No newline at end of file
+}



From sidnei at x3ng.com.br  Sat Jun 28 15:52:46 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/CaseStudies - index_html.cl:1.2
Message-ID: <200306281952.h5SJqkZ20302@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/CaseStudies
In directory cvs.zope.org:/tmp/cvs-serv20236/Resources/CaseStudies

Modified Files:
	index_html.cl 
Log Message:
update from nzo

=== Products/ZopeOrg-NV/skeleton/Resources/CaseStudies/index_html.cl 1.1 => 1.2 ===
 Language: 
 Rights: 
 
-[macros]
-listing = here/nzo_listing_macros/macros/case_study
-footer = 
-header = 
-
 [default]
 result_source = catalog
-limit = 0
+sort_key = Date
 allowed_types = Case Study
 sort_order = asc
-sort_key = Date
+limit = 0
+
+[macros]
+header = 
+footer = 
+listing = here/nzo_listing_macros/macros/case_study
 



From sidnei at x3ng.com.br  Sat Jun 28 15:52:24 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton - local_html.properties:1.1
Message-ID: <200306281952.h5SJqOk20293@cvs.baymountain.com>

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

Added Files:
	local_html.properties 
Log Message:
update from nzo

=== Added File Products/ZopeOrg-NV/skeleton/local_html.properties ===
title:string=



From sidnei at x3ng.com.br  Sat Jun 28 15:52:16 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton/Resources/ZSP - index_html.cl:1.2
Message-ID: <200306281952.h5SJqGx20272@cvs.baymountain.com>

Update of /cvs-zopeorg/Products/ZopeOrg-NV/skeleton/Resources/ZSP
In directory cvs.zope.org:/tmp/cvs-serv20236/Resources/ZSP

Modified Files:
	index_html.cl 
Log Message:
update from nzo

=== Products/ZopeOrg-NV/skeleton/Resources/ZSP/index_html.cl 1.1 => 1.2 ===
 Language: 
 Rights: 
 
-[macros]
-listing = here/nzo_listing_macros/macros/zope_service_provider
-footer = 
-header = 
-
 [default]
 result_source = container
-limit = 0
+sort_key = Title
 allowed_types = Zope Service Provider
 sort_order = asc
-sort_key = Title
+limit = 0
+
+[macros]
+header = 
+footer = 
+listing = here/nzo_listing_macros/macros/zope_service_provider
 



From sidnei at x3ng.com.br  Sat Jun 28 15:52:45 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton - local_html.pt:1.18
Message-ID: <200306281952.h5SJqj620300@cvs.baymountain.com>

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

Modified Files:
	local_html.pt 
Log Message:
update from nzo

=== Products/ZopeOrg-NV/skeleton/local_html.pt 1.17 => 1.18 ===
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html><!-- -*-html-helper-*- -->
+<html xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns="http://www.w3.org/1999/xhtml">
+<!-- -*-html-helper-*- -->
   <head>
     <title tal:content="template/title">The title</title>
+    <meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type"/>
   </head>
   <body>
-  <TABLE class="columns" metal:define-macro="body">
-  <TR> 
-    <TD class="main">
-      <div> 
+  <table metal:define-macro="body" class="columns">
+  <tr>
+    <td class="main">
       <h1>Welcome to Zope.org</h1>
 
       <div class="hilite">The Website for the Zope Community</div>
-      
-      <H2>What is Zope?</H2>
+
+      <h2>What is Zope?</h2>
 
       <p>Zope is an open source application server for building
       content managements, intranets, portals, and custom
@@ -21,84 +21,112 @@
       companies and thousands of developers all over the world,
       working on building the platform and Zope applications. Zope is
       written in Python, a highly-productive, object-oriented
-      scripting language. <A 
-            href="#">more</A></p>
+      scripting language. <a href="#">more</a></p>
+
+      <div class="message">
+       <p><b>Warning</b>: This site is in Alpha state. The following
+issues are
+      known at the moment:</p>
+
+        <ul>
+	  <li> Registration is read-only for now. </li>
+	  <li> The &quot;lost password&quot; functionality is disabled as well
+	  </li>
+	  <li> Requester on collector issues was not yet migrated
+	  </li>
+	  <li> Most objects have the creator set to 'sidnei'. That
+	  will be fixed before the final version </li>
+	  <li> Most links on the frontpage don't work yet</li>
+	  </ul>
 
+	  <p>For bug reports, please refer to <a href="http://collector.zope.org/ZopeOrg">http://collector.zope.org/ZopeOrg</a>
+	  </p>
+
+	  <p><em>Thank you</em>.</p>
+
+	</div>
 
 <!--
       <h2>Spotlight on "Using Zope With Amaya"</h2>
-      <div class="hilite">By <a href="#">Michel Pelletier</a> 21 August, 2001</div>
-      <p>Zope is an object-oriented web application server that 
-      is managed through a web interface. This interface allows 
-      you to add and manipulate Zope objects. Zope's management 
-      interface is one of its most powerful features, but there 
-      is one area where using Zope's managment interface is 
-      difficult: editing templates.  <A 
-            href="#">more</A></p>
+      <div class="hilite">By <a href="#">Michel Pelletier</a> 21 August,
+2001</div>
+      <p>Zope is an object-oriented web application server that
+      is managed through a web interface. This interface allows
+      you to add and manipulate Zope objects. Zope's management
+      interface is one of its most powerful features, but there
+      is one area where using Zope's managment interface is
+      difficult: editing templates.  <a
+            href="#">more</a></p>
 -->
 
       <h2>Zope for...</h2>
       <ul>
       <li>
-      <strong><a href="#" title="New to Zope but familiar with website programming">New Users</a></strong>
-        <div class="subitems"><a href="">Intro</a>, 
-            <a href="">About Python</a>, 
-	    <a href="">Web Programming</a> 
+      <strong><a title="New to Zope but familiar with website programming" href="#">New Users</a></strong>
+        <div class="subitems"><a href="">Intro</a>,
+            <a href="">About Python</a>,
+	    <a href="">Web Programming</a>
         </div>
       </li>
      </ul>
      <ul>
      <li>
-      <strong><a href="#" title="Using Zope to make a website">Web Masters</a></strong>
+      <strong><a title="Using Zope to make a website" href="#">Web
+Masters</a></strong>
               <div class="subitems">
-	      <a href="">Using Apache</a>, 
-	      <a href="">Security</a>, 
-	      <a href="">Backup policies</a>, 
+	      <a href="">Using Apache</a>,
+	      <a href="">Security</a>,
+	      <a href="">Backup policies</a>,
 	      <a href="#">DTML </a>
 	      </div>
       </li>
      </ul>
      <ul>
       <li>
-      <strong><a href="#" title="Using Zope to make applications">Product Developers</a></strong>
+      <strong><a title="Using Zope to make applications" href="#">Product Developers</a></strong>
         <div class="subitems">
-	<a href="">Developers Guide</a>, 
-	<a href="#">ZClasses</a>, 
-	<a href="">Unit testing</a> 
+	<a href="">Developers Guide</a>,
+	<a href="#">ZClasses</a>,
+	<a href="">Unit testing</a>
 	</div>
      </li>
      </ul>
      <ul>
      <li>
-     <strong><a href="#" title="Doing the impossible, Improving Zope">Zope Developers</a></strong>
-        <div class="subitems"><a href="">Products</a>, 
+     <strong><a title="Doing the impossible, Improving Zope" href="#">Zope Developers</a></strong>
+        <div class="subitems"><a href="">Products</a>,
 	    <a href="">Using CVS</a>,
-	    <a href="">Bug days</a> 
+	    <a href="">Bug days</a>
 	</div>
      </li>
      </ul>
 
-    </TD>
+    </td>
 
-    <TD class="right"> 
+    <td class="right">
     <div class="box">
 
     <div class="box">
 
-        <h5>News</h5>
+        <h5><span><a href="#"
+               tal:attributes="href string:${portal_url}/news">News</a>
+            </span>
+            <a href="#"
+               tal:attributes="href string:${portal_url}/news.rss">
+               <img src="xml.gif"
+                    tal:attributes="src string:${portal_url}/xml.gif"
+                    alt="RSS Newsfeed"/></a>
+             </h5>
 	<div class="body">
         <tal:block repeat="item python:here.latestContentBySubject(portal_type='News Item', max_items=7)">
-	<div class="content odd" 
-             tal:define="even repeat/item/even"
-             tal:attributes="class python:test(even, 'content even', 'content odd')">
-        <img src="icon.gif" tal:attributes="src item/getIcon; 
-                                            alt item/title_or_id" />
-	<a href="#" tal:attributes="href item/absolute_url">
+	<div tal:attributes="class python:test(even, 'content even', 'content odd')" tal:define="even repeat/item/even" class="content odd">
+        <img tal:attributes="src item/getIcon;                                             alt item/title_or_id" src="icon.gif"/>
+	<a tal:attributes="href item/absolute_url" href="#">
 		      <span tal:replace="string:${item/title_or_id}">
                       O'Reilly Call For Papers Deadline
                       </span>
 	  </a>
-	  <div class="boxDetails" tal:content="python:DateTime(item.CreationDate()).strftime('%B %d')">February 03</div>
+	  <div tal:content="python:DateTime(item.CreationDate()).strftime('%B %d')" class="boxDetails">February 03</div>
 
 	</div>
         </tal:block>
@@ -106,30 +134,32 @@
      </div>
     <div class="box">
 
-        <h5>Products</h5>
+        <h5><span><a href="#"
+               tal:attributes="href string:${portal_url}/Products">Products</a></span>
+            <a href="#"
+               tal:attributes="href string:${portal_url}/products.rss">
+               <img src="xml.gif"
+                    tal:attributes="src string:${portal_url}/xml.gif"
+                    alt="Products RSS"/></a></h5>
 	<div class="body">
         <tal:block repeat="item python:here.latestContentBySubject(portal_type='Software Release', max_items=5)">
-	<div class="content odd" 
-             tal:define="even repeat/item/even;
-                         package item/getPackage;
-                         pkg_title package/title|item/title_or_id|nothing"
-             tal:attributes="class python:test(even, 'content even', 'content odd')">
-        <img src="icon.gif" tal:attributes="src item/getIcon; 
-                                            alt item/title_or_id" />
-        <a href="#" tal:attributes="href item/absolute_url">
+	<div tal:attributes="class python:test(even, 'content even', 'content odd')" tal:define="even repeat/item/even;                          package item/getPackage;                          pkg_title package/title|item/title_or_id|nothing" class="content odd">
+        <img tal:attributes="src item/getIcon;                                             alt item/title_or_id" src="icon.gif"/>
+        <a tal:attributes="href item/absolute_url" href="#">
 		      <span tal:replace="string:${pkg_title} (${item/Version})">
                       O'Reilly Call For Papers Deadline
                       </span>
 	  </a>
-	  <div class="boxDetails" tal:content="python:DateTime(item.CreationDate()).strftime('%B %d')">February 03</div>
+	  <div tal:content="python:DateTime(item.CreationDate()).strftime('%B %d')" class="boxDetails">February 03</div>
 
 	</div>
         </tal:block>
 	</div>
      </div>
+</div>
 
-   </TD>
-  </TR>
-</TABLE>
+   </td>
+  </tr>
+</table>
 </body>
-</html>
\ No newline at end of file
+</html>



From sidnei at x3ng.com.br  Sun Jun 29 08:32:29 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/Extensions - NZOMigrate.py:1.34
Message-ID: <200306291232.h5TCWTs06160@cvs.baymountain.com>

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

Modified Files:
	NZOMigrate.py 
Log Message:
Last updates on migration

=== Products/ZopeOrg-NV/Extensions/NZOMigrate.py 1.33 => 1.34 ===
 from zExceptions.ExceptionFormatter import format_exception
 import zLOG
 
+from AccessControl import SpecialUsers
+
 def _send_update_notice(self, *args, **kw):
     pass
 
@@ -23,16 +25,11 @@
                    'SiteAnnouncement', 'WhatIsZope', 'ZopeArchitecture', 'ZopeNews', 'privacy.html',
                    'Members']
         migrate.sort()
-        migrate = migrate[migrate.index('Members'):]
         ignore_path = ['/%s' % o for o in source.objectIds() if o not in migrate]
     members_ignore = ['billqian', 'edward', 'epson', 'ltunes', 'michel', 'superuser', \
-                      'myUnreviewed', 'mail_password_form', \
+                      'ewilliams', 'myUnreviewed', 'mail_password_form', \
                       'mail_password_template', 'password_html', 'tim.kidder', 'update_html', \
                       'index_html']
-    mids = source.Members.objectIds()
-    mids.sort()
-    mids = mids[:mids.index('ewilliams')]
-    members_ignore.extend(mids)
     dont_migrate = ['/Members/%s' % o for o in members_ignore]
     ignore_path.extend(dont_migrate)
     if exceptions is None:
@@ -553,6 +550,12 @@
         owner = orig.getOwner()
     except:
         owner = None
+    if owner is None:
+        if '_owner' in new.__dict__.keys():
+            delattr(new, '_owner')
+            return new
+    if '__ac_local_roles__' in new.__dict__.keys():
+        delattr(new, '__ac_local_roles__')
     try:
         new.changeOwnership(owner)
     except: pass



From sidnei at x3ng.com.br  Sun Jun 29 08:39:37 2003
From: sidnei at x3ng.com.br (Sidnei da Silva)
Date: Sun Aug 10 17:02:14 2008
Subject: [zopeorg-checkins] CVS: Products/ZopeOrg-NV/skeleton - local_html.pt.properties:1.1 local_html.properties:NONE
Message-ID: <200306291239.h5TCdbM07122@cvs.baymountain.com>

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

Added Files:
	local_html.pt.properties 
Removed Files:
	local_html.properties 
Log Message:
Last updates on migration

=== Added File Products/ZopeOrg-NV/skeleton/local_html.pt.properties ===
title:string=

=== Removed File Products/ZopeOrg-NV/skeleton/local_html.properties ===