[Checkins] SVN: zopetoolkit/branches/ccomb/ merge from trunk
Christophe Combelles
ccomb at free.fr
Sun May 16 13:54:14 EDT 2010
Log message for revision 112371:
merge from trunk
Changed:
A zopetoolkit/branches/ccomb/COPYRIGHT.txt
A zopetoolkit/branches/ccomb/LICENSE.txt
U zopetoolkit/branches/ccomb/README.txt
U zopetoolkit/branches/ccomb/bootstrap.py
U zopetoolkit/branches/ccomb/buildout.cfg
U zopetoolkit/branches/ccomb/index.rst
U zopetoolkit/branches/ccomb/ztk.cfg
-=-
Copied: zopetoolkit/branches/ccomb/COPYRIGHT.txt (from rev 112370, zopetoolkit/trunk/COPYRIGHT.txt)
===================================================================
--- zopetoolkit/branches/ccomb/COPYRIGHT.txt (rev 0)
+++ zopetoolkit/branches/ccomb/COPYRIGHT.txt 2010-05-16 17:54:14 UTC (rev 112371)
@@ -0,0 +1 @@
+Zope Foundation and Contributors
\ No newline at end of file
Copied: zopetoolkit/branches/ccomb/LICENSE.txt (from rev 112370, zopetoolkit/trunk/LICENSE.txt)
===================================================================
--- zopetoolkit/branches/ccomb/LICENSE.txt (rev 0)
+++ zopetoolkit/branches/ccomb/LICENSE.txt 2010-05-16 17:54:14 UTC (rev 112371)
@@ -0,0 +1,44 @@
+Zope Public License (ZPL) Version 2.1
+
+A copyright notice accompanies this license document that identifies the
+copyright holders.
+
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions in source code must retain the accompanying copyright
+notice, this list of conditions, and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying copyright
+notice, this list of conditions, and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software without prior written permission from the
+copyright holders.
+
+4. The right to distribute this software or to use it for any purpose does not
+give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+copyright
+holders. Use of them is covered by separate agreement with the copyright
+holders.
+
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
+
+Disclaimer
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: zopetoolkit/branches/ccomb/README.txt
===================================================================
--- zopetoolkit/branches/ccomb/README.txt 2010-05-16 17:37:27 UTC (rev 112370)
+++ zopetoolkit/branches/ccomb/README.txt 2010-05-16 17:54:14 UTC (rev 112371)
@@ -13,13 +13,13 @@
dependencies) and can directly be used with a buildout by specifying this file
via the ``extends`` mechanism.
-To test the ZTK, run ``bin/test-ztk``.
+To test the ZTK, run ``bin/test-ztk``.
To generate dependency graphs for the ZTK, run ``bin/depgraph``. The
resulting SVN graphs will be in ``parts/depgraph``.
For details about the ZTK, please see http://docs.zope.org/zopetoolkit.
-
+
Transition support
------------------
Modified: zopetoolkit/branches/ccomb/bootstrap.py
===================================================================
--- zopetoolkit/branches/ccomb/bootstrap.py 2010-05-16 17:37:27 UTC (rev 112370)
+++ zopetoolkit/branches/ccomb/bootstrap.py 2010-05-16 17:54:14 UTC (rev 112371)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
Modified: zopetoolkit/branches/ccomb/buildout.cfg
===================================================================
--- zopetoolkit/branches/ccomb/buildout.cfg 2010-05-16 17:37:27 UTC (rev 112370)
+++ zopetoolkit/branches/ccomb/buildout.cfg 2010-05-16 17:54:14 UTC (rev 112371)
@@ -1,8 +1,12 @@
[buildout]
-parts = test-ztk test-zopeapp depgraph
+parts =
+ test-ztk
+ test-zopeapp
+ depgraph
extensions = mr.developer
-extends = ztk.cfg
- zopeapp.cfg
+extends =
+ ztk.cfg
+ zopeapp.cfg
versions = versions
allow-picked-versions = false
Modified: zopetoolkit/branches/ccomb/index.rst
===================================================================
--- zopetoolkit/branches/ccomb/index.rst 2010-05-16 17:37:27 UTC (rev 112370)
+++ zopetoolkit/branches/ccomb/index.rst 2010-05-16 17:54:14 UTC (rev 112371)
@@ -16,7 +16,7 @@
The Zope Toolkit cannot be installed directly except as individual
libraries (such as ``zope.component``). To install it you typically
would install a toolkit or application that makes use of these
-libraries. The Zope project itself manages Zope 3 and Grok.
+libraries. Examples of such projects are BlueBream, Grok and Zope 2.
The 1.0 release of the Zope Toolkit contains a number of
refactorings that are aimed to clean up dependencies between pieces of
@@ -34,10 +34,7 @@
case.
We recommend you update your existing code to import from the new
-packages if possible. We list major changes below. We are also working
-on an extension to the Zope testrunner that can indicate indirect
-imports, as well as a tool to upgrade existing ZODBs to make use of
-new import locations.
+packages if possible. We list major changes below.
Migration issues
----------------
@@ -47,7 +44,7 @@
This package was renamed to ``zope.keyreference`` and all its
functionality was moved to the new one. The new package contains a
-little workaround for making old persistent keyrerefences loadable
+little workaround for making old persistent keyreferences loadable
without ``zope.app.keyreference`` installed, so the latter one is not
needed at all anymore. Still review your code for any imports coming
from ``zope.app.keyreference`` and modify it to use
@@ -160,10 +157,10 @@
All interfaces (`IAuthentication`, `IUnauthenticatedPrincipal`, `ILoginPassword`
and so on.) were moved into a new ``zope.authentication`` package, as well as
several utility things, like `PrincipalSource` and `checkPrincipal` function.
-The new package has much less dependencies and defines an abstract contracts for
-implementing authentication within Zope Framewowk. While backward compatibility
-imports are left in place, it's strongly reccommended to update your imports to
-the ``zope.authentication``.
+The new package has much less dependencies and defines an abstract contract for
+implementing authentication policies. While backward compatibility imports are
+left in place, it's strongly recommended to update your imports to the
+``zope.authentication``.
The `global principal registry` and its ZCML directives are moved into a new
``zope.principalregistry`` package with backward-compatibility imports left in
Modified: zopetoolkit/branches/ccomb/ztk.cfg
===================================================================
--- zopetoolkit/branches/ccomb/ztk.cfg 2010-05-16 17:37:27 UTC (rev 112370)
+++ zopetoolkit/branches/ccomb/ztk.cfg 2010-05-16 17:54:14 UTC (rev 112371)
@@ -49,7 +49,7 @@
zope.pagetemplate
zope.password
zope.pluggableauth
-# zope.principalannotation
+ zope.principalannotation
zope.principalregistry
zope.processlifetime
zope.proxy
@@ -95,71 +95,71 @@
zope.applicationcontrol = 3.5.5
zope.authentication = 3.7.0
zope.broken = 3.6.0
-zope.browser = 1.2
-zope.browsermenu = 3.9.0
-zope.browserpage = 3.12.0
-zope.browserresource = 3.10.2
+zope.browser = 1.3
+zope.browsermenu = 3.9.1
+zope.browserpage = 3.12.1
+zope.browserresource = 3.10.3
zope.cachedescriptors = 3.5.0
zope.catalog = 3.8.1
-zope.component = 3.9.3
+zope.component = 3.9.4
zope.componentvocabulary = 1.0
-zope.configuration = 3.7.1
-zope.container = 3.11.0
-zope.contentprovider = 3.7
+zope.configuration = 3.7.2
+zope.container = 3.11.1
+zope.contentprovider = 3.7.1
zope.contenttype = 3.5.1
zope.copy = 3.5.0
zope.copypastemove = 3.6.0
zope.datetime = 3.4.0
-zope.deferredimport = 3.5.0
+zope.deferredimport = 3.5.1
zope.deprecation = 3.4.0
zope.documenttemplate = 3.4.2
zope.dottedname = 3.4.6
zope.dublincore = 3.6.0
zope.error = 3.7.0
zope.event = 3.4.1
-zope.exceptions = 3.5.2
+zope.exceptions = 3.6.0
zope.file = 0.5.0
zope.filerepresentation = 3.6.0
-zope.formlib = 4.0.2
+zope.formlib = 4.0.3
zope.hookable = 3.4.1
zope.html = 2.0.0
-zope.i18n = 3.7.2
-zope.i18nmessageid = 3.5.1
+zope.i18n = 3.7.3
+zope.i18nmessageid = 3.5.2
zope.index = 3.6.0
-zope.interface = 3.5.3
+zope.interface = 3.6.1
zope.intid = 3.7.2
zope.keyreference = 3.6.2
-zope.lifecycleevent = 3.6.0
+zope.lifecycleevent = 3.6.1
zope.location = 3.9.0
zope.login = 1.0.0
zope.mimetype = 1.2.0
zope.minmax = 1.1.2
-zope.pagetemplate = 3.5.0
+zope.pagetemplate = 3.5.1
zope.password = 3.5.1
zope.pluggableauth = 1.0.1
-zope.principalannotation = 3.6.0
+zope.principalannotation = 3.6.1
zope.principalregistry = 3.7.0
zope.processlifetime = 1.0
-zope.proxy = 3.5.0
+zope.proxy = 3.6.0
zope.ptresource = 3.9.0
-zope.publisher = 3.12.2
+zope.publisher = 3.12.3
zope.ramcache = 1.0
-zope.schema = 3.6.1
-zope.security = 3.7.2
+zope.schema = 3.6.3
+zope.security = 3.7.3
zope.securitypolicy = 3.6.1
-zope.sendmail = 3.7.1
+zope.sendmail = 3.7.2
zope.sequencesort = 3.4.0
zope.server = 3.6.1
zope.session = 3.9.2
-zope.site = 3.9.0
+zope.site = 3.9.1
zope.size = 3.4.1
-zope.structuredtext = 3.4.0
+zope.structuredtext = 3.5.0
zope.tal = 3.5.2
-zope.tales = 3.5.0
-zope.testbrowser = 3.7.0
-zope.testing = 3.8.7
-zope.traversing = 3.12.0
-zope.viewlet = 3.7.0
+zope.tales = 3.5.1
+zope.testbrowser = 3.8.1
+zope.testing = 3.9.4
+zope.traversing = 3.12.1
+zope.viewlet = 3.7.1
# Under review:
@@ -171,25 +171,26 @@
ClientForm = 0.2.10
distribute = 0.6.10
docutils = 0.6
-Jinja2 = 2.2.1
+Jinja2 = 2.4.1
mechanize = 0.1.11
py = 1.0.0
-Pygments = 1.2.2
+Pygments = 1.3.1
python-gettext = 1.0
-pytz = 2010b
+pytz = 2010h
RestrictedPython = 3.5.1
setuptools = 0.6c11
-Sphinx = 0.6.4
-transaction = 1.0.0
+Sphinx = 0.6.5
+transaction = 1.0.1
z3c.recipe.sphinxdoc = 0.0.8
zc.buildout = 1.4.3
zc.lockfile = 1.0.0
-ZConfig = 2.7.1
+ZConfig = 2.8.0
zc.recipe.egg = 1.2.2
zc.recipe.testrunner = 1.2.0
zc.resourcelibrary = 1.3.1
zdaemon = 2.0.4
-ZODB3 = 3.9.4
+ZODB3 = 3.9.5
+zope.mkzeoinstance = 3.9.4
# Not a dependency:
More information about the checkins
mailing list