[Zope-Checkins] SVN: Zope/trunk/ Updated to ZODB 3.9.0a10. ZODB-level version support has been removed and ZopeUndo now is part of Zope2.

2009-02-09 Thread Hanno Schlichting
Log message for revision 96302:
  Updated to ZODB 3.9.0a10. ZODB-level version support has been removed and 
ZopeUndo now is part of Zope2.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/src/OFS/History.py
  U   Zope/trunk/src/OFS/XMLExportImport.py
  U   Zope/trunk/src/OFS/tests/testHistory.py
  U   Zope/trunk/src/Products/TemporaryFolder/TemporaryFolder.py
  U   Zope/trunk/src/Products/TemporaryFolder/mount.py
  U   Zope/trunk/src/Products/ZODBMountPoint/tests/testMountPoint.py
  U   Zope/trunk/src/Zope2/Startup/tests/test_schema.py
  A   Zope/trunk/src/ZopeUndo/
  U   Zope/trunk/versions-zope2.cfg

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2009-02-09 10:32:17 UTC (rev 96301)
+++ Zope/trunk/doc/CHANGES.txt  2009-02-09 10:42:22 UTC (rev 96302)
@@ -9,6 +9,9 @@
 
 Restructuring
 
+  - Updated to ZODB 3.9.0a10. ZODB-level version support has been
+removed and ZopeUndo now is part of Zope2.
+
   - The Zope2 SVN trunk is now a buildout pulling in all dependencies as
 actual released packages and not SVN externals anymore.
 

Modified: Zope/trunk/src/OFS/History.py
===
--- Zope/trunk/src/OFS/History.py   2009-02-09 10:32:17 UTC (rev 96301)
+++ Zope/trunk/src/OFS/History.py   2009-02-09 10:42:22 UTC (rev 96302)
@@ -117,8 +117,7 @@
 first=request.get('first_transaction', first)
 last=request.get('last_transaction',last)
 
-
-r=self._p_jar.db().history(self._p_oid, None, last)
+r=self._p_jar.db().history(self._p_oid, size=last)
 if r is None:
 # storage doesn't support history
 return ()

Modified: Zope/trunk/src/OFS/XMLExportImport.py
===
--- Zope/trunk/src/OFS/XMLExportImport.py   2009-02-09 10:32:17 UTC (rev 
96301)
+++ Zope/trunk/src/OFS/XMLExportImport.py   2009-02-09 10:42:22 UTC (rev 
96302)
@@ -38,7 +38,6 @@
 elif type(file) is str: file=open(file,'w+b')
 write=file.write
 write('?xml version=1.0?\012ZopeData\012')
-version=jar._version
 ref=referencesf
 oids=[oid]
 done_oids={}
@@ -49,8 +48,15 @@
 del oids[0]
 if done(oid): continue
 done_oids[oid]=1
-try: p, serial = load(oid, version)
-except: pass # Ick, a broken reference
+try:
+try:
+p, serial = load(oid)
+except TypeError:
+# Some places inside the ZODB 3.9 still want a version
+# argument, for example TmpStore from Connection.py
+p, serial = load(oid, None)
+except:
+pass # Ick, a broken reference
 else:
 ref(p, oids)
 write(XMLrecord(oid,len(p),p))

Modified: Zope/trunk/src/OFS/tests/testHistory.py
===
--- Zope/trunk/src/OFS/tests/testHistory.py 2009-02-09 10:32:17 UTC (rev 
96301)
+++ Zope/trunk/src/OFS/tests/testHistory.py 2009-02-09 10:42:22 UTC (rev 
96302)
@@ -60,7 +60,7 @@
 for i in range(3):
 entry = r[i]
 # check no new keys show up without testing
-self.assertEqual(len(entry.keys()),7)
+self.assertEqual(len(entry.keys()),6)
 # the transactions are in newest-first order
 self.assertEqual(entry['description'],'Change %i' % (3-i))
 self.failUnless('key' in entry) 
@@ -72,8 +72,7 @@
 # check times are increasing
 self.failUnless(entry['time']r[i-1]['time'])
 self.assertEqual(entry['user_name'],'')
-self.assertEqual(entry['version'],'')
-
+
 def test_manage_historyCopy(self):
 # we assume this works 'cos it's tested above
 r = self.ps.manage_change_history()

Modified: Zope/trunk/src/Products/TemporaryFolder/TemporaryFolder.py
===
--- Zope/trunk/src/Products/TemporaryFolder/TemporaryFolder.py  2009-02-09 
10:32:17 UTC (rev 96301)
+++ Zope/trunk/src/Products/TemporaryFolder/TemporaryFolder.py  2009-02-09 
10:42:22 UTC (rev 96302)
@@ -72,15 +72,9 @@
 
 manage_traceback = DTMLFile('dtml/mountfail', globals())
 
-def _createDB(self, db=None): # huh?  db=db was original
+def _createDB(self):
  Create a mounted RAM database 
-db = DB(TemporaryStorage())
-# the connection in 2.5.X - 2.6.1 was a low conflict connection,
-# but this caused synchronization problems.  For 2.6.2, we want
-# to reenable read conflict errors, so we use a default connection
-# type.
-#db.klass = LowConflictConnection
-return db
+return DB(TemporaryStorage())
 
 def _getMountRoot(self, root):
 sdc = 

[Zope-Checkins] SVN: Zope/trunk/versions-zope2.cfg Update zope.container version to one that doesn't depend on zope.app.broken anymore

2009-02-09 Thread Hanno Schlichting
Log message for revision 96304:
  Update zope.container version to one that doesn't depend on zope.app.broken 
anymore
  

Changed:
  U   Zope/trunk/versions-zope2.cfg

-=-
Modified: Zope/trunk/versions-zope2.cfg
===
--- Zope/trunk/versions-zope2.cfg   2009-02-09 10:44:40 UTC (rev 96303)
+++ Zope/trunk/versions-zope2.cfg   2009-02-09 11:31:04 UTC (rev 96304)
@@ -16,6 +16,7 @@
 zope.broken = 3.5.0
 zope.browser = 0.5.0
 zope.contenttype = 3.4.1
+zope.container = 3.7.1
 zope.deferredimport = 3.5.0
 zope.location = 3.5.2
 zope.publisher = 3.5.5
@@ -23,3 +24,4 @@
 zope.testbrowser = 3.6.0a2
 zope.traversing = 3.5.2
 zope.app.apidoc = 3.6.1
+zope.app.broken = 3.5.0

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Ignore buildout stuff.

2009-02-09 Thread Stefan H. Holek
Log message for revision 96309:
  Ignore buildout stuff.

Changed:
  _U  Zope/trunk/

-=-

Property changes on: Zope/trunk
___
Modified: svn:ignore
   - access
bin
build
import
include
inituser
ZODBTests.fs*
makefile
Products
etc
log
build-base
testing.log
var

   + access
bin
build
import
include
inituser
ZODBTests.fs*
makefile
Products
etc
log
build-base
testing.log
var
develop-eggs
eggs
parts
.installed.cfg


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/2.11/configure python 2.4.6 has been out for a while

2009-02-09 Thread Martijn Pieters
Log message for revision 96311:
  python 2.4.6 has been out for a while
  

Changed:
  U   Zope/branches/2.11/configure

-=-
Modified: Zope/branches/2.11/configure
===
--- Zope/branches/2.11/configure2009-02-09 13:23:23 UTC (rev 96310)
+++ Zope/branches/2.11/configure2009-02-09 13:26:42 UTC (rev 96311)
@@ -12,13 +12,13 @@
 
 # Place the optimal target version number for Zope (as returned by sys.version)
 # below
-TARGET=2.4.5
+TARGET=2.4.6
 
 # Order a list of acceptable python version numbers (as returned by
 # sys.version) below in best to worst order, not including the
 # target version.  Up to six acceptable python versions are allowed.
 # Do not include the target version number in this list!
-ACCEPTABLE=2.4.4
+ACCEPTABLE=2.4.5 2.4.4
 
 # provide the executable names for all the acceptable versions
 # (and the target version) below

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/2.10/ LP/#143873: Fixed problems when no HTTP_ACCEPT_CHARSET is in the request. This required an update of zope.publisher to 3.3.3.

2009-02-09 Thread Hanno Schlichting
Log message for revision 96312:
  LP/#143873: Fixed problems when no HTTP_ACCEPT_CHARSET is in the request. 
This required an update of zope.publisher to 3.3.3.
  

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  _U  Zope/branches/2.10/lib/python/zope/

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===
--- Zope/branches/2.10/doc/CHANGES.txt  2009-02-09 13:26:42 UTC (rev 96311)
+++ Zope/branches/2.10/doc/CHANGES.txt  2009-02-09 13:35:00 UTC (rev 96312)
@@ -19,13 +19,16 @@
 
 Bugs fixed
 
+  - LP/#143873: Fixed problems when no HTTP_ACCEPT_CHARSET is in the
+request. This required an update of zope.publisher to 3.3.3.
+
   - LP/#324876: tighened regex for detecting the charset
 from a meta-equiv header
 
   - Acquisition wrappers now correctly proxy __iter__.
 
   - Products.PluginIndexes.PathIndex:  backported doc fixes /
-optiimizations from trunk (and ExtendedPathIndex).
+optimizations from trunk (and ExtendedPathIndex).
 
   - Launchpad #174705:  ensure that the error info object exposed to a
 'tal:on_error' handler has attributes visible to restricted code.


Property changes on: Zope/branches/2.10/lib/python/zope
___
Modified: svn:externals
   - annotation   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/annotation
cachedescriptors 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/cachedescriptors
component
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/component
configuration
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/configuration
contentprovider  
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/contentprovider
contenttype  
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/contenttype
copypastemove
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/copypastemove
datetime 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/datetime
decorator
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/decorator
deferredimport   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/deferredimport
deprecation  
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/deprecation
documenttemplate 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/documenttemplate
dottedname   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/dottedname
dublincore   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/dublincore
event
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/event
exceptions   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/exceptions
filerepresentation   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/filerepresentation
formlib  
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/formlib
hookable 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/hookable
i18n 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/i18n
i18nmessageid
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/i18nmessageid
index
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/index
interface
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/interface
lifecycleevent   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/lifecycleevent
location 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/location
modulealias  
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/modulealias
pagetemplate 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/pagetemplate
proxy
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/proxy
publisher
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/publisher
rdb  svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/rdb
schema   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/schema
security 
svn://svn.zope.org/repos/main/zope.security/tags/3.3.3/src/zope/security
sendmail 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/sendmail
server   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/server
size 
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/size
structuredtext   
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/structuredtext
tal  svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/tal
tales
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/tales
testbrowser  
svn://svn.zope.org/repos/main/Zope3/tags/3.3.2/src/zope/testbrowser
testing  
svn://svn.zope.org/repos/main/zope.testing/tags/3.0/src/zope/testing
thread   

[Zope-Checkins] SVN: Zope/trunk/ Update externals to new ZODB version.

2009-02-09 Thread Stefan H. Holek
Log message for revision 96313:
  Update externals to new ZODB version.

Changed:
  _U  Zope/trunk/include/
  _U  Zope/trunk/utilities/

-=-

Property changes on: Zope/trunk/include
___
Modified: svn:externals
   - Acquisition 
svn://svn.zope.org/repos/main/Acquisition/trunk/src/Acquisition
ExtensionClass  
svn://svn.zope.org/repos/main/ExtensionClass/trunk/src/ExtensionClass
persistent  svn://svn.zope.org/repos/main/ZODB/tags/3.8.0/src/persistent

   + Acquisition 
svn://svn.zope.org/repos/main/Acquisition/trunk/src/Acquisition
ExtensionClass  
svn://svn.zope.org/repos/main/ExtensionClass/trunk/src/ExtensionClass
persistent  svn://svn.zope.org/repos/main/ZODB/tags/3.9.0a10/src/persistent



Property changes on: Zope/trunk/utilities
___
Modified: svn:externals
   - ZODBTools svn://svn.zope.org/repos/main/ZODB/tags/3.8.1/src/ZODB/scripts

   + ZODBTools svn://svn.zope.org/repos/main/ZODB/tags/3.9.0a10/src/ZODB/scripts


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/ Copy the entry id into the event log as well; this lets you correlate between

2009-02-09 Thread Martijn Pieters
Log message for revision 96315:
  Copy the entry id into the event log as well; this lets you correlate between
  eventlog entries and their corresponding entry in the SiteErrorLog. Needed 
when
  a user reports the entry id after seeing an error and the server has since
  restarted.
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/src/Products/SiteErrorLog/SiteErrorLog.py
  U   Zope/trunk/src/Products/SiteErrorLog/tests/testSiteErrorLog.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2009-02-09 14:28:13 UTC (rev 96314)
+++ Zope/trunk/doc/CHANGES.txt  2009-02-09 14:43:57 UTC (rev 96315)
@@ -269,6 +269,12 @@
 for more time zones and up to date daylight saving time
 information.
 
+  - SiteErrorLog now includes the entry id in the information copied to
+the event log. This allowes you to correlate a user error report with
+the event log after a restart, or let's you find the REQUEST
+information in the SiteErrorLog when looking at a traceback in the
+event log.
+
 Bugs Fixed
 
   - Specified height/width of icons in ZMI listings so the table doesn't

Modified: Zope/trunk/src/Products/SiteErrorLog/SiteErrorLog.py
===
--- Zope/trunk/src/Products/SiteErrorLog/SiteErrorLog.py2009-02-09 
14:28:13 UTC (rev 96314)
+++ Zope/trunk/src/Products/SiteErrorLog/SiteErrorLog.py2009-02-09 
14:43:57 UTC (rev 96315)
@@ -216,18 +216,18 @@
 LOG.error('Error while logging', exc_info=sys.exc_info())
 else:
 if self.copy_to_zlog:
-self._do_copy_to_zlog(now,strtype,str(url),tb_text)
+
self._do_copy_to_zlog(now,strtype,entry_id,str(url),tb_text)
 return '%s/showEntry?id=%s' % (self.absolute_url(), entry_id)
 finally:
 info = None
 
-def _do_copy_to_zlog(self,now,strtype,url,tb_text):
+def _do_copy_to_zlog(self,now,strtype,entry_id,url,tb_text):
 when = _rate_restrict_pool.get(strtype,0)
 if nowwhen:
 next_when = max(when, 
now-_rate_restrict_burst*_rate_restrict_period)
 next_when += _rate_restrict_period
 _rate_restrict_pool[strtype] = next_when
-LOG.error('%s\n%s' % (url, tb_text.rstrip()))
+LOG.error('%s %s\n%s' % (entry_id, url, tb_text.rstrip()))
 
 security.declareProtected(use_error_logging, 'getProperties')
 def getProperties(self):

Modified: Zope/trunk/src/Products/SiteErrorLog/tests/testSiteErrorLog.py
===
--- Zope/trunk/src/Products/SiteErrorLog/tests/testSiteErrorLog.py  
2009-02-09 14:28:13 UTC (rev 96314)
+++ Zope/trunk/src/Products/SiteErrorLog/tests/testSiteErrorLog.py  
2009-02-09 14:43:57 UTC (rev 96315)
@@ -14,6 +14,7 @@
 
 import sys
 import unittest
+import logging
 
 
 class SiteErrorLogTests(unittest.TestCase):
@@ -27,10 +28,18 @@
 from Products.SiteErrorLog.SiteErrorLog import SiteErrorLog
 self.app._setObject('error_log', SiteErrorLog())
 self.app.manage_addDTMLMethod('doc', '')
+
+self.logger = logging.getLogger('Zope.SiteErrorLog')
+self.log = logging.handlers.BufferingHandler(sys.maxint)
+self.logger.addHandler(self.log)
+self.old_level = self.logger.level
+self.logger.setLevel(logging.ERROR)
 except:
 self.tearDown()
 
 def tearDown(self):
+self.logger.removeHandler(self.log)
+self.logger.setLevel(self.old_level)
 transaction.abort()
 self.app._p_jar.close()
 
@@ -121,6 +130,22 @@
 # log entries
 self.assertEquals(len(sel_ob.getLogEntries()), previous_log_length)
 
+def testEntryID(self):
+elog = self.app.error_log
+
+# Create a predictable error
+try:
+raise AttributeError, DummyAttribute
+except AttributeError:
+info = sys.exc_info()
+elog.raising(info)
+
+entries = elog.getLogEntries()
+entry_id = entries[0]['id']
+
+self.assertTrue(entry_id in self.log.buffer[-1].msg, 
+(entry_id, self.log.buffer[-1].msg))
+
 def testCleanup(self):
 # Need to make sure that the __error_log__ hook gets cleaned up
 self.app._delObject('error_log')

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/branches/2.11/ Merge r96315 from trunk: copy entry_id to the event log too

2009-02-09 Thread Martijn Pieters
Log message for revision 96316:
  Merge r96315 from trunk: copy entry_id to the event log too

Changed:
  U   Zope/branches/2.11/doc/CHANGES.txt
  U   Zope/branches/2.11/lib/python/Products/SiteErrorLog/SiteErrorLog.py
  U   
Zope/branches/2.11/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py

-=-
Modified: Zope/branches/2.11/doc/CHANGES.txt
===
--- Zope/branches/2.11/doc/CHANGES.txt  2009-02-09 14:43:57 UTC (rev 96315)
+++ Zope/branches/2.11/doc/CHANGES.txt  2009-02-09 14:52:36 UTC (rev 96316)
@@ -6,6 +6,14 @@
 
   Zope 2.11.3 (unreleased)
 
+Features added
+
+  - SiteErrorLog now includes the entry id in the information copied to
+the event log. This allowes you to correlate a user error report with
+the event log after a restart, or let's you find the REQUEST
+information in the SiteErrorLog when looking at a traceback in the
+event log.
+
 Restructuring
 
   - Added 'InitializeClass' alias in 'App.class_init' to ease migration.

Modified: Zope/branches/2.11/lib/python/Products/SiteErrorLog/SiteErrorLog.py
===
--- Zope/branches/2.11/lib/python/Products/SiteErrorLog/SiteErrorLog.py 
2009-02-09 14:43:57 UTC (rev 96315)
+++ Zope/branches/2.11/lib/python/Products/SiteErrorLog/SiteErrorLog.py 
2009-02-09 14:52:36 UTC (rev 96316)
@@ -213,18 +213,18 @@
 LOG.error('Error while logging', exc_info=sys.exc_info())
 else:
 if self.copy_to_zlog:
-self._do_copy_to_zlog(now,strtype,str(url),tb_text)
+
self._do_copy_to_zlog(now,strtype,entry_id,str(url),tb_text)
 return '%s/showEntry?id=%s' % (self.absolute_url(), entry_id)
 finally:
 info = None
 
-def _do_copy_to_zlog(self,now,strtype,url,tb_text):
+def _do_copy_to_zlog(self,now,strtype,entry_id,url,tb_text):
 when = _rate_restrict_pool.get(strtype,0)
 if nowwhen:
 next_when = max(when, 
now-_rate_restrict_burst*_rate_restrict_period)
 next_when += _rate_restrict_period
 _rate_restrict_pool[strtype] = next_when
-LOG.error('%s\n%s' % (url, tb_text.rstrip()))
+LOG.error('%s %s\n%s' % (entry_id, url, tb_text.rstrip()))
 
 security.declareProtected(use_error_logging, 'getProperties')
 def getProperties(self):

Modified: 
Zope/branches/2.11/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py
===
--- 
Zope/branches/2.11/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py   
2009-02-09 14:43:57 UTC (rev 96315)
+++ 
Zope/branches/2.11/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py   
2009-02-09 14:52:36 UTC (rev 96316)
@@ -14,6 +14,7 @@
 
 import sys
 import unittest
+import logging
 
 
 class SiteErrorLogTests(unittest.TestCase):
@@ -27,10 +28,18 @@
 from Products.SiteErrorLog.SiteErrorLog import SiteErrorLog
 self.app._setObject('error_log', SiteErrorLog())
 self.app.manage_addDTMLMethod('doc', '')
+
+self.logger = logging.getLogger('Zope.SiteErrorLog')
+self.log = logging.handlers.BufferingHandler(sys.maxint)
+self.logger.addHandler(self.log)
+self.old_level = self.logger.level
+self.logger.setLevel(logging.ERROR)
 except:
 self.tearDown()
 
 def tearDown(self):
+self.logger.removeHandler(self.log)
+self.logger.setLevel(self.old_level)
 transaction.abort()
 self.app._p_jar.close()
 
@@ -121,6 +130,22 @@
 # log entries
 self.assertEquals(len(sel_ob.getLogEntries()), previous_log_length)
 
+def testEntryID(self):
+elog = self.app.error_log
+
+# Create a predictable error
+try:
+raise AttributeError, DummyAttribute
+except AttributeError:
+info = sys.exc_info()
+elog.raising(info)
+
+entries = elog.getLogEntries()
+entry_id = entries[0]['id']
+
+self.assertTrue(entry_id in self.log.buffer[-1].msg, 
+(entry_id, self.log.buffer[-1].msg))
+
 def testCleanup(self):
 # Need to make sure that the __error_log__ hook gets cleaned up
 self.app._delObject('error_log')

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/doc/ Moved out the change notes for the 2.10 line into the history

2009-02-09 Thread Hanno Schlichting
Log message for revision 96318:
  Moved out the change notes for the 2.10 line into the history
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/doc/HISTORY.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2009-02-09 14:57:31 UTC (rev 96317)
+++ Zope/trunk/doc/CHANGES.txt  2009-02-09 14:59:06 UTC (rev 96318)
@@ -87,11 +87,6 @@
   - Removed deprecated ZCML directives from Five including the whole
 Five.site subpackage.
 
-  - Turned deprecation warnings for manage_afterAdd, manage_beforeDelete
-and manage_afterClone methods into discouraged warnings. These methods
-will not be removed in Zope 2.11, but stay for the foreseeable future.
-Using events is still highly encouraged.
-
   - Moved two implements declarations from Five into the proper classes.
 
   - Document.sequence: replaced by zope.sequencesort
@@ -113,47 +108,11 @@
 
   - Removed OFS.content_types (was deprecated since Zope 2.9)
 
-  - Undeprecated 'zLOG', which will remain a backward-compatibility
-shim for the Python logging module.
-
   - Indexes: Removed unused parameters from '_apply_index' methods.
 
-  - Fixed Collector #2190: Calls to
-zope.security.management.checkPermission aren't rerouted to
-Zope 2's security policy.
-
-NOTE: If you already have a Zope 2.10 instance running, you
-will either have to recreate it or add the following lines to
-the end of the etc/site.zcml file::
-
-  securityPolicy
-component=Products.Five.security.FiveSecurityPolicy /
-
-  - Fixed Collector #2223: Evaluation of booleans in TALES and the
-'default' variable.
-
   - Removed deprecated support for product initialization based on
 '__ac_permissions__' and 'meta_types' attributes.
 
-  - Collector #2213: Can't edit old ZopePageTemplate instances.
-
-  - Collector #2235: A number of ZCatalog methods were doing boolean
-evaluation of objects that implemented __len__ instead of checking
-them against None. Replaced a number of if not obj with
-if obj is None.
-
-  - reStructuredText/ZReST: setting raw_enabled to 0 for security
-reasons
-
-  - Collector #2113:  'zopectl test' masked Ctrl-C.
-
-  - OFS Image: Image and File updated to use isinstance(data, str)
-and raises TypeError upon encountering unicode objects.
-
-  - OFS Application: Updated deprecation warnings.
-Support for '__ac_permissions__' and 'meta_types' will be removed in
-Zope 2.11, 'methods' support might remain longer.
-
 Features added
 
   - Acquisition has been made aware of __parent__ pointers. This allows
@@ -221,23 +180,6 @@
 particular useful when running Zope behind a loadbalancer (patch by
 Patrick Gerken).
 
-  - the ZopePageTemplate implementation now uses unicode internally.
-Non-unicode instances are migrated on-the-fly to unicode. However
-this will work only properly for ZPT instances formerly encoded as
-utf-8 or ISO-8859-15. For other encodings you might set the
-environment variable ZPT_REFERRED_ENCODING to insert your preferred
-encoding in front of utf-8 and ISO-8859-15 within the encoding
-sniffer code.
-
-In addition there is a new 'output_encodings' property that controls
-the conversion from/to unicode for WebDAV/FTP operations.
-
-  - the ZPT implementation has now a configurable option in order how
-to deal with UnicodeDecodeErrors. A custom
-UnicodeEncodingConflictResolver can be configured through ZCML (see
-Products/PageTemplates/(configure.zcml, unicodeconflictresolver.py,
-interfaces.py)
-
   - AccessControl.Role: added new method
 manage_getUserRolesAndPermissions().
 
@@ -298,36 +240,14 @@
 
   - Made Five.testbrowser compatible with mechanize 0.1.7b.
 
-  - Ensure that response header values cannot embed CRLF pairs, which
-violate the HTTP spec (RFC 2616).
-
   - Testing.ZopeTestCase: installPackage was tied to the ZopeLite layer.
 
   - Launchpad #280334: Fixed problem with 'timeout'
 argument/attribute missing in testbrowser tests.
 
-  - Launchpad #282677: fixed implementation of guarded_map and
-provided tests and implementation for guarded_zip (RestrictedPython).
-
-  - Lauchpad #143736,#271395: fixed AttributeError' on _ltid in TempStorage
-
-  - 'AccessControl.ZopeGuards.guarded_import' mapped some Unauthorized
-exceptions onto ImportErrors:  don't do that!  Also, removed
-mutable defaults from argument list, improved tests.
-
-  - LP #281156:  'AccessControl.SecurityInfo.secureModule' dropped
-ModuleSecurity for failed imports, obscuring later attempts to
-import the same broken 

[Zope-Checkins] SVN: Zope/branches/2.10/ Merge r96315 from trunk: copy entry_id to the event log too

2009-02-09 Thread Martijn Pieters
Log message for revision 96319:
  Merge r96315 from trunk: copy entry_id to the event log too
  

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  U   Zope/branches/2.10/lib/python/Products/SiteErrorLog/SiteErrorLog.py
  U   
Zope/branches/2.10/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===
--- Zope/branches/2.10/doc/CHANGES.txt  2009-02-09 14:59:06 UTC (rev 96318)
+++ Zope/branches/2.10/doc/CHANGES.txt  2009-02-09 15:03:38 UTC (rev 96319)
@@ -6,6 +6,14 @@
 
   Zope 2.10.8 (unreleased)
 
+Features added
+
+  - SiteErrorLog now includes the entry id in the information copied to
+the event log. This allowes you to correlate a user error report with
+the event log after a restart, or let's you find the REQUEST
+information in the SiteErrorLog when looking at a traceback in the
+event log.
+
 Restructuring
 
   - Added 'InitializeClass' alias in 'App.class_init' to ease migration.

Modified: Zope/branches/2.10/lib/python/Products/SiteErrorLog/SiteErrorLog.py
===
--- Zope/branches/2.10/lib/python/Products/SiteErrorLog/SiteErrorLog.py 
2009-02-09 14:59:06 UTC (rev 96318)
+++ Zope/branches/2.10/lib/python/Products/SiteErrorLog/SiteErrorLog.py 
2009-02-09 15:03:38 UTC (rev 96319)
@@ -213,18 +213,18 @@
 LOG.error('Error while logging', exc_info=sys.exc_info())
 else:
 if self.copy_to_zlog:
-self._do_copy_to_zlog(now,strtype,str(url),tb_text)
+
self._do_copy_to_zlog(now,strtype,entry_id,str(url),tb_text)
 return '%s/showEntry?id=%s' % (self.absolute_url(), entry_id)
 finally:
 info = None
 
-def _do_copy_to_zlog(self,now,strtype,url,tb_text):
+def _do_copy_to_zlog(self,now,strtype,entry_id,url,tb_text):
 when = _rate_restrict_pool.get(strtype,0)
 if nowwhen:
 next_when = max(when, 
now-_rate_restrict_burst*_rate_restrict_period)
 next_when += _rate_restrict_period
 _rate_restrict_pool[strtype] = next_when
-LOG.error('%s\n%s' % (url, tb_text.rstrip()))
+LOG.error('%s %s\n%s' % (entry_id, url, tb_text.rstrip()))
 
 security.declareProtected(use_error_logging, 'getProperties')
 def getProperties(self):

Modified: 
Zope/branches/2.10/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py
===
--- 
Zope/branches/2.10/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py   
2009-02-09 14:59:06 UTC (rev 96318)
+++ 
Zope/branches/2.10/lib/python/Products/SiteErrorLog/tests/testSiteErrorLog.py   
2009-02-09 15:03:38 UTC (rev 96319)
@@ -14,6 +14,7 @@
 
 import sys
 import unittest
+import logging
 
 
 class SiteErrorLogTests(unittest.TestCase):
@@ -27,10 +28,18 @@
 from Products.SiteErrorLog.SiteErrorLog import SiteErrorLog
 self.app._setObject('error_log', SiteErrorLog())
 self.app.manage_addDTMLMethod('doc', '')
+
+self.logger = logging.getLogger('Zope.SiteErrorLog')
+self.log = logging.handlers.BufferingHandler(sys.maxint)
+self.logger.addHandler(self.log)
+self.old_level = self.logger.level
+self.logger.setLevel(logging.ERROR)
 except:
 self.tearDown()
 
 def tearDown(self):
+self.logger.removeHandler(self.log)
+self.logger.setLevel(self.old_level)
 transaction.abort()
 self.app._p_jar.close()
 
@@ -121,6 +130,22 @@
 # log entries
 self.assertEquals(len(sel_ob.getLogEntries()), previous_log_length)
 
+def testEntryID(self):
+elog = self.app.error_log
+
+# Create a predictable error
+try:
+raise AttributeError, DummyAttribute
+except AttributeError:
+info = sys.exc_info()
+elog.raising(info)
+
+entries = elog.getLogEntries()
+entry_id = entries[0]['id']
+
+self.assertTrue(entry_id in self.log.buffer[-1].msg, 
+(entry_id, self.log.buffer[-1].msg))
+
 def testCleanup(self):
 # Need to make sure that the __error_log__ hook gets cleaned up
 self.app._delObject('error_log')

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/inst/Makefile.in 'bin' is no longer a build-time artifact.

2009-02-09 Thread Tres Seaver
Log message for revision 96330:
  'bin' is no longer a build-time artifact.

Changed:
  U   Zope/trunk/inst/Makefile.in

-=-
Modified: Zope/trunk/inst/Makefile.in
===
--- Zope/trunk/inst/Makefile.in 2009-02-09 18:27:22 UTC (rev 96329)
+++ Zope/trunk/inst/Makefile.in 2009-02-09 18:49:42 UTC (rev 96330)
@@ -93,7 +93,6 @@
 
 # uninstance:  Remove the instance files made by testinstance (w/ prejudice)
 uninstance:
-   ${RMRF} ${BASE_DIR}/bin
${RMRF} ${BASE_DIR}/etc
${RMRF} ${BASE_DIR}/import
${RMRF} ${BASE_DIR}/log

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/doc/ Moved out the changes from the 2.11-line into the history

2009-02-09 Thread Hanno Schlichting
Log message for revision 96331:
  Moved out the changes from the 2.11-line into the history
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/doc/HISTORY.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2009-02-09 18:49:42 UTC (rev 96330)
+++ Zope/trunk/doc/CHANGES.txt  2009-02-09 19:49:36 UTC (rev 96331)
@@ -46,27 +46,20 @@
   - Avoid deprecation warnings for the md5 and sha modules in Python 2.6
 by adding conditional imports for the hashlib module.
 
-  - Replaced  imports from the 'Globals' module throughout the 
+  - Replaced imports from the 'Globals' module throughout the 
 tree with imports from the actual modules;  the 'Globals' module
 was always intended to be an area for shared data, rather than
 a facade for imports.  Added zope.deferred.deprecation entries
 to 'Globals' for all symbols / modules previously imported directly.
 
-  - Updated 'pytz' from '2007f' to '2008i'.
-
-  - Moved svn:externals for 'mechanize', 'ClientPath', and 'pytz' to
-versions managed outside the Zope3 trunk.
-
   - Protect against non-existing zope.conf path and products directories.
 This makes it possible to run a Zope instance without a Products or
 lib/python directory.
 
-  - updated to ZODB 3.8.1
-
   - Moved exception MountedStorageError from ZODB.POSExceptions
 to Products.TemporaryFolder.mount (now its only client).
 
-  - LP #253362:  Moved Zope2-specific module, ZODB/Mount.py, to
+  - Moved Zope2-specific module, ZODB/Mount.py, to
 Products/TemporaryFolder/mount.py (its only client is
 Products/TemporaryFolder/TemporaryFolder.py).
 
@@ -87,62 +80,12 @@
   - Removed deprecated ZCML directives from Five including the whole
 Five.site subpackage.
 
-  - Moved two implements declarations from Five into the proper classes.
-
-  - Document.sequence: replaced by zope.sequencesort
-
-  - All Products folders as well as the zope and zope.app folders are
-declared as setuptools namespace packages now. See
-http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
-for more information about namespace packages.
-
-  - ZPT: removed display of ZPT warnings since warnings were
-removed from the zope.pagetemplate implementation 
-
-  - Ship Zope with a standard docutils 0.4 distribution, instead
-of a patched one.  Both trusted and untrusted code are still
-protected against unwanted file inclusion.
-
-  - Removed ZGadflyDA (was deprecated since Zope 2.9). The code is
-still available from svn.zope.org/Products.ZGadflyDA.
-
-  - Removed OFS.content_types (was deprecated since Zope 2.9)
-
-  - Indexes: Removed unused parameters from '_apply_index' methods.
-
-  - Removed deprecated support for product initialization based on
-'__ac_permissions__' and 'meta_types' attributes.
-
 Features added
 
   - Acquisition has been made aware of __parent__ pointers. This allows
 direct access to many Zope 3 classes without the need to mixin
 Acquisition base classes for the security to work.
 
-  - Zope2 startup: Zope will now send DatabaseOpened and
-ProcessStarting events.
-
-  - Testing.ZopeTestCase: Introduced a ZopeLite test layer, making it
-possible to mix ZTC and non-ZTC tests much more freely.
-
-  - Testing/custom_zodb.py: added support use a different storage other
-than DemoStorage. A dedicated FileStorage can be mount by setting
-the $TEST_FILESTORAGE environment variable to a custom Data.fs
-file.  A ZEO server can be configured using the $TEST_ZEO_HOST and
-$TEST_ZEO_PORT environment variables. This new functionality allows
-us to use the standard Zope testrunner for writing and running
-tests against existing Zope installations.
-
-  - The ZPublisher HTTP request has now both the debug and locale
-attributes available, like its Zope 3 counterpart. The debug
-attribute was so far limited to code from the zope.* namespace in
-order to make the Zope 3 ZPT engine work. The locale attribute
-provides access to an zope.i18n.interfaces.locales.ILocale object
-with access to locale related information like date / time
-formatting or translated language and country names. Form variables
-of both debug and locale will shadow these two attributes and their
-use is therefor discouraged.
-
   - MailHost: now uses zope.sendmail for delivering the mail. With this
 change MailHost integrates with the Zope transaction system (avoids
 sending dupe emails in case of conflict errors). In addition
@@ -153,64 +96,12 @@
 mail from its delivery.  In addition MailHosts now supports
 

[Zope-Checkins] SVN: Zope/trunk/doc/ Moved in the changes from the yet unreleased 2.10 and 2.11 versions into the history. The changes.txt now only includes entries being truly new to the trunk

2009-02-09 Thread Hanno Schlichting
Log message for revision 96332:
  Moved in the changes from the yet unreleased 2.10 and 2.11 versions into the 
history. The changes.txt now only includes entries being truly new to the trunk
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/doc/HISTORY.txt

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===
--- Zope/trunk/doc/CHANGES.txt  2009-02-09 19:49:36 UTC (rev 96331)
+++ Zope/trunk/doc/CHANGES.txt  2009-02-09 19:59:39 UTC (rev 96332)
@@ -4,7 +4,6 @@
   Change information for previous versions of Zope can be found in the
   file HISTORY.txt.
 
-
   Trunk (unreleased)
 
 Restructuring
@@ -96,12 +95,6 @@
 mail from its delivery.  In addition MailHosts now supports
 encrypted connections through TLS/SSL.
 
-  - A new module, AccessControl.requestmethod, provides a decorator
-factory that limits decorated methods to one request method only.
-For example, marking a method with @requestmethod('POST') limits
-that method to POST requests only when published. Several
-security-related methods have been limited to POST only.
-
   - SiteErrorLog now includes the entry id in the information copied to
 the event log. This allowes you to correlate a user error report with
 the event log after a restart, or let's you find the REQUEST
@@ -113,18 +106,10 @@
   - Specified height/width of icons in ZMI listings so the table doesn't
 jump around while loading.
 
-  - Acquisition wrappers now correctly proxy __iter__.
-
-  - Launchpad #174705:  ensure that the error info object exposed to a
-'tal:on_error' handler has attributes visible to restricted code.
-
   - After the proper introduction of parent-pointers, it's now
 wrong to acquisition-wrap content providers. We will now use
 the classic content provider expression from Zope 3.
 
-  - Testing.ZopeTestCase: Remove quota argument from DemoStorage calls in
-preparation for ZODB 3.9.
-
   - Ported c69896 to Five. This fix makes it possible to provide a
 template using Python, and not have it being set to `None` by
 the viewlet manager directive.

Modified: Zope/trunk/doc/HISTORY.txt
===
--- Zope/trunk/doc/HISTORY.txt  2009-02-09 19:49:36 UTC (rev 96331)
+++ Zope/trunk/doc/HISTORY.txt  2009-02-09 19:59:39 UTC (rev 96332)
@@ -4,12 +4,23 @@
   Zope. Change information for the current release can be found
   in the file CHANGES.txt.
 
-Zope Changes
+  Zope 2.11.3 (unreleased)
 
-  This file contains change information for the current Zope release.
-  Change information for previous versions of Zope can be found in the
-  file HISTORY.txt.
+Bugs Fixed
 
+  - configure script: setting ZOPE_VERS to '2.11'
+
+  - Products.PluginIndexes.PathIndex:  backported doc fixes /
+optiimizations from trunk (and ExtendedPathIndex).
+
+  - Updated 'pytz' from '2007f' to '2008i'.
+
+  - Moved svn:externals for 'mechanize', 'ClientPath', and 'pytz' to
+versions managed outside the Zope3 trunk.
+  
+  - Testing.ZopeTestCase: Remove quota argument from DemoStorage calls in
+preparation for ZODB 3.9.
+
   Zope 2.11.2 (2008/10/24) 
 
 Bugs Fixed
@@ -244,6 +255,32 @@
 them against None. Replaced a number of if not obj with
 if obj is None.
 
+  Zope 2.10.8 (unreleased)
+
+Restructuring
+
+  - Added 'InitializeClass' alias in 'App.class_init' to ease migration.
+In Zope 2.12 it will be recommended to import 'InitializeClass' from
+'App.class_init' instead of 'Globals'.
+
+  - Moved 'ApplicationDefaultPermissions' from 'App.class_init' to
+'AccessControl.Permissions', in order to break an import cycle
+in third-party code which avoids imports from 'Globals.'  Left
+the class importable from its old location without deprecation.
+
+Bugs fixed
+
+  - LP/#143873: Fixed problems when no HTTP_ACCEPT_CHARSET is in the
+request. This required an update of zope.publisher to 3.3.3.
+
+  - LP/#324876: tighened regex for detecting the charset
+from a meta-equiv header
+
+  - Acquisition wrappers now correctly proxy __iter__.
+
+  - Launchpad #174705:  ensure that the error info object exposed to a
+'tal:on_error' handler has attributes visible to restricted code.
+
   Zope 2.10.7 (2008/10/24)
 
 Bugs fixed

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/doc/INSTALL.txt ReSTify the installation docs, and note use of buildout vs. CMMI.

2009-02-09 Thread Tres Seaver
Log message for revision 96333:
  ReSTify the installation docs, and note use of buildout vs. CMMI.
  
  

Changed:
  U   Zope/trunk/doc/INSTALL.txt

-=-
Modified: Zope/trunk/doc/INSTALL.txt
===
--- Zope/trunk/doc/INSTALL.txt  2009-02-09 19:59:39 UTC (rev 96332)
+++ Zope/trunk/doc/INSTALL.txt  2009-02-09 20:19:37 UTC (rev 96333)
@@ -1,206 +1,194 @@
+
 Building and installing Zope from source
-
+
 
-  Welcome to Zope!  This document describes building and installing
-  Zope on UNIX and Linux.
+Welcome to Zope!  This document describes building and installing
+Zope on UNIX and Linux.
 
-  See WINDOWS.txt for information about Windows.  See the PLATFORMS
-  directory for notes about various other platforms.
+See ``doc/WINDOWS.txt`` for information about Windows.  See the
+``doc/PLATFORMS`` directory for notes about various other platforms.
 
-System requirements when building from source
 
-   * bash or another Bourne shell variant
+Prerequisites
+-
 
-   * Python 2.4.2 or later installed somewhere in the system PATH
- (Python 2.5 is not supported)
+System requirements when building from source
 
-   * GNU make
+- A supported version of Python, including the development support if
+  installed from system-level packages.  Supported versions include::
 
-   * A C compiler (gcc recommended)
+  o 2.4.x, (x = 4)
 
-Recommendations
+  o 2.5.x
+  
+- Zope needs the Python ``zlib`` module to be importable.  If you are
+  building your own Python from source, please be sure that you have the
+  headers installed which correspond to your system's ``zlib``.
 
-  - You are recommended to build and install Zope as a non-root user.
+- A C compiler capable of building extension modules for your Python
+  (gcc recommended).
 
+
 Building Zope
+-
 
-  To build Zope, run the conventional UNIX build sequence from within
-  the Zope source tree::
+Zope is built using the ``zc.buildout`` library, which needs to be
+boostrapped with your Python version.  E.g.::
 
-./configure --prefix=/where/to/install/zope
-make
+  $ cd /path/to/zope
+  $ /path/to/your/python bootstrap/bootstrap.py
 
-  If you do not specify a '--prefix' option, during a later step, Zope
-  will be installed into a default location.
+The boostrap script creates a ``buildout`` script in ``bin``;  run this
+script to finish building Zope::
 
-  If the configure script cannot find a suitable Python interpreter
-  for use with Zope, it will complain with an informative error
-  message.  If this happens, you may use the '--with-python'
-  command-line option to 'configure' to specify which Python
-  interpreter to use.  Run './configure --help' to see other
-  command-line options available via the configure script.
+  $ bin/buildout
 
-  Optional:  Building and Installing Zope 'In-Place' (SVN checkouts only)
 
-Older versions of Zope were typically run directly from the
-'source' directory itself.  This is useful for development
-purposes.  You can regain that behavior by performing the
-following sequence of commands within a Zope source directory:
+Creating a Zope Instance
+
 
-  ./configure
-  make instance
+Once you've performed the install step, to begin actually using
+Zope, you will need to create an instance home, which is a
+directory that contains configuration and data for a Zope server
+process.  The instance home is created using the ``mkzopeinstance``
+script::
 
-This command also creates an administrative user with the
-specified username and password.
+  $ /bin/mkzopeinstance
 
-WARNING: make instance doesn't work on FreeBSD 5.0 and
-presumably other platforms. You should either use GNU make
-(gmake instance), or use make install instead.
+You will be asked to provide a user name and password for an
+administrator's account during ``mkzopeinstance``.  To see the available
+ommand-line options, run the script with the ``--help`` option::
 
-Making an In-Place instance builds the binary files and creates
-the files necessary for a Zope instance to be run directly
-within the build directory (e.g. 'in-place').  You may start
-Zope by running::
+  $ bin/mkzopeinstance --help
 
-  ./bin/zopectl start
 
-See ./log/event.log for any output which may happen during
-start of Zope. If anything goes wrong you will see there.
+Starting Zope as a Daemon
+-
 
-If you use
+Once an instance home has been created, the Zope server can now be
+started using this command::
 
-  ./bin/zopectl fg
+  $ /path/to/zope/instance/bin/zopectl start
 
-instead, the output is generated to the screen. In this case
-Zope does not detach from terminal.
+During start, zope emits log messages into ./log/event.log
+You can examine it 

[Zope-Checkins] SVN: Zope/trunk/doc/INSTALL.txt Note to-do.

2009-02-09 Thread Tres Seaver
Log message for revision 96334:
  Note to-do.

Changed:
  U   Zope/trunk/doc/INSTALL.txt

-=-
Modified: Zope/trunk/doc/INSTALL.txt
===
--- Zope/trunk/doc/INSTALL.txt  2009-02-09 20:19:37 UTC (rev 96333)
+++ Zope/trunk/doc/INSTALL.txt  2009-02-09 20:19:53 UTC (rev 96334)
@@ -47,6 +47,8 @@
 Creating a Zope Instance
 
 
+XXX:  Make this not a lie!
+
 Once you've performed the install step, to begin actually using
 Zope, you will need to create an instance home, which is a
 directory that contains configuration and data for a Zope server

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/README.txt Start at cleanups.

2009-02-09 Thread Tres Seaver
Log message for revision 96335:
  Start at cleanups.

Changed:
  U   Zope/trunk/README.txt

-=-
Modified: Zope/trunk/README.txt
===
--- Zope/trunk/README.txt   2009-02-09 20:19:53 UTC (rev 96334)
+++ Zope/trunk/README.txt   2009-02-09 20:23:50 UTC (rev 96335)
@@ -6,7 +6,7 @@
 This document provides some general information about the Zope source
 release and provides links to other documents.
 
-Installation information can be found in ``Zope/doc/INSTALL.txt``.  Other
+Installation information can be found in ``doc/INSTALL.txt``.  Other
 documentation is also in the doc directory and in the Zope.org
 documentation section at http://www.zope.org/Documentation/.
 
@@ -33,12 +33,12 @@
 Installing Zope
 ---
 
-Follow the instructions in ``Zope/doc/INSTALL.txt`` to install Zope.
+Follow the instructions in ``doc/INSTALL.txt`` to install Zope.
 
 Reporting bugs
 --
 
 Bugs reports should be made through the Zope bugtracker at
-http://collector.zope.org/Zope.  A bug report should contain detailed
+https://bugs.launchpad.net/zope2.  A bug report should contain detailed
 information about how to reproduce the bug, error messages (see
-/error_log within the ZMI or var/event.log)
+``/error_log`` within the ZMI or ``var/event.log``).

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/doc/ Removed the inclusion of the ZEO 3.6 documentation. There's no reason we should handle the ZEO stuff

2009-02-09 Thread Hanno Schlichting
Log message for revision 96340:
  Removed the inclusion of the ZEO 3.6 documentation. There's no reason we 
should handle the ZEO stuff
   different from any other package. All packages have their own home on PyPi 
today.
  

Changed:
  _U  Zope/trunk/doc/

-=-

Property changes on: Zope/trunk/doc
___
Deleted: svn:externals
   - ZEO   -r 41153 svn://svn.zope.org/repos/main/ZODB/branches/3.6/doc/ZEO


___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/README.txt Updated the readme to make it applicable to a general Zope2 release and not just a source release

2009-02-09 Thread Hanno Schlichting
Log message for revision 96344:
  Updated the readme to make it applicable to a general Zope2 release and not 
just a source release
  

Changed:
  U   Zope/trunk/README.txt

-=-
Modified: Zope/trunk/README.txt
===
--- Zope/trunk/README.txt   2009-02-09 21:23:26 UTC (rev 96343)
+++ Zope/trunk/README.txt   2009-02-09 21:27:08 UTC (rev 96344)
@@ -1,28 +1,21 @@
-Welcome to The Zope Source Release
-==
+Introduction
+
 
-Zope is an open-source web application server.
+Zope2 is an open-source web application server.
 
-This document provides some general information about the Zope source
-release and provides links to other documents.
+This document provides some general information about Zope2 and provides
+links to other documents.
 
 Installation information can be found in ``doc/INSTALL.txt``.  Other
-documentation is also in the doc directory and in the Zope.org
+documentation is also in the doc directory and in the zope.org
 documentation section at http://www.zope.org/Documentation/.
 
 General Zope information is available at http://www.zope.org/
 
-Report problems with this release on the Zope mailing list
-(z...@zope.org) To subscribe to the list send mail to
-zope-requ...@zope.org with subscribe in the subject line.
-
-Introduction
+Installation
 
 
-The source release is intended for tinkerers, those who want to use
-Zope components separately, people who want to use their own Python,
-and people who work on platforms that are not supported by a binary
-distribution.
+Follow the instructions in ``doc/INSTALL.txt`` to install Zope.
 
 License
 ---
@@ -30,15 +23,18 @@
 The Zope License is included in ``ZopePublicLicense.txt``.  Send your
 feedback about the license to zope-lice...@zope.org.
 
-Installing Zope

+Bug tracker
+---
 
-Follow the instructions in ``doc/INSTALL.txt`` to install Zope.
-
-Reporting bugs
---
-
 Bugs reports should be made through the Zope bugtracker at
 https://bugs.launchpad.net/zope2.  A bug report should contain detailed
 information about how to reproduce the bug, error messages (see
 ``/error_log`` within the ZMI or ``var/event.log``).
+
+Mailing list
+
+
+You can contact and discuss the development of Zope2 itself on the Zope
+mailing list (z...@zope.org). To subscribe to the list send mail to
+zope-requ...@zope.org with subscribe in the subject line.
+

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/versions-zope2.cfg Upgrade RestrictedPython to 3.5.0.

2009-02-09 Thread Stefan H. Holek
Log message for revision 96357:
  Upgrade RestrictedPython to 3.5.0.

Changed:
  U   Zope/trunk/versions-zope2.cfg

-=-
Modified: Zope/trunk/versions-zope2.cfg
===
--- Zope/trunk/versions-zope2.cfg   2009-02-10 00:31:29 UTC (rev 96356)
+++ Zope/trunk/versions-zope2.cfg   2009-02-10 00:41:28 UTC (rev 96357)
@@ -9,6 +9,7 @@
 DateTime = 2.11.2
 ExtensionClass = 2.11.1
 Persistence = 2.11.1
+RestrictedPython = 3.5.0
 tempstorage = 2.11.1
 zLOG = 2.11.1
 zc.lockfile = 1.0

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins


[Zope-Checkins] SVN: Zope/trunk/alltests.cfg Fetch zope.app.broken dependency.

2009-02-09 Thread Stefan H. Holek
Log message for revision 96358:
  Fetch zope.app.broken dependency.

Changed:
  U   Zope/trunk/alltests.cfg

-=-
Modified: Zope/trunk/alltests.cfg
===
--- Zope/trunk/alltests.cfg 2009-02-10 00:41:28 UTC (rev 96357)
+++ Zope/trunk/alltests.cfg 2009-02-10 00:42:32 UTC (rev 96358)
@@ -64,6 +64,7 @@
 zope.traversing
 zope.viewlet
 # Fetch undeclared ftests dependencies
+zope.app.broken
 zope.app.principalannotation
 zope.app.schema
 zope.app.securitypolicy

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins