[Zope-Checkins] SVN: Zope/trunk/ Updated to newer versions of zope packages. Removed long deprecated defaultSkin, layer and skin ZCML directives.
Hanno Schlichting
plone at hannosch.info
Mon Feb 2 14:11:51 EST 2009
Log message for revision 95991:
Updated to newer versions of zope packages. Removed long deprecated defaultSkin, layer and skin ZCML directives.
Changed:
U Zope/trunk/doc/CHANGES.txt
U Zope/trunk/lib/python/OFS/interfaces.py
U Zope/trunk/lib/python/Products/Five/browser/meta.zcml
U Zope/trunk/lib/python/Products/Five/browser/tests/skin.txt
U Zope/trunk/lib/python/Products/Five/component/__init__.py
U Zope/trunk/lib/python/Products/Five/component/component.txt
U Zope/trunk/lib/python/Products/Five/component/configure.zcml
U Zope/trunk/lib/python/Products/Five/component/interfaces.py
U Zope/trunk/lib/python/Products/Five/component/makesite.txt
U Zope/trunk/lib/python/Products/Five/meta.zcml
-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/doc/CHANGES.txt 2009-02-02 19:11:51 UTC (rev 95991)
@@ -9,6 +9,9 @@
Restructuring
+ - Updated to newer versions of zope packages. Removed long deprecated
+ defaultSkin, layer and skin ZCML directives.
+
- Disabled the XML export on the UI level - the export functionality
however is still available on the Python level.
Modified: Zope/trunk/lib/python/OFS/interfaces.py
===================================================================
--- Zope/trunk/lib/python/OFS/interfaces.py 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/OFS/interfaces.py 2009-02-02 19:11:51 UTC (rev 95991)
@@ -28,7 +28,7 @@
from webdav.interfaces import IDAVResource
from zope.traversing.interfaces import IContainmentRoot
-from zope.app.component.interfaces import IPossibleSite
+from zope.location.interfaces import IPossibleSite
class IOrderedContainer(Interface):
Modified: Zope/trunk/lib/python/Products/Five/browser/meta.zcml
===================================================================
--- Zope/trunk/lib/python/Products/Five/browser/meta.zcml 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/Products/Five/browser/meta.zcml 2009-02-02 19:11:51 UTC (rev 95991)
@@ -101,27 +101,6 @@
handler=".metaconfigure.resourceDirectory"
/>
-
- <!-- misc. directives -->
-
- <meta:directive
- name="layer"
- schema="zope.app.publisher.browser.metadirectives.ILayerDirective"
- handler="zope.app.publisher.browser.metaconfigure.layer"
- />
-
- <meta:directive
- name="skin"
- schema="zope.app.publisher.browser.metadirectives.ISkinDirective"
- handler="zope.app.publisher.browser.metaconfigure.skin"
- />
-
- <meta:directive
- name="defaultSkin"
- schema="zope.app.publisher.browser.metadirectives.IDefaultSkinDirective"
- handler="zope.app.publisher.browser.metaconfigure.defaultSkin"
- />
-
</meta:directives>
</configure>
Modified: Zope/trunk/lib/python/Products/Five/browser/tests/skin.txt
===================================================================
--- Zope/trunk/lib/python/Products/Five/browser/tests/skin.txt 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/Products/Five/browser/tests/skin.txt 2009-02-02 19:11:51 UTC (rev 95991)
@@ -31,22 +31,7 @@
...
The eagle has landed
-Or when we make that skin the default skin:
- >>> zcml.load_string('''
- ... <browser:defaultSkin
- ... xmlns:browser="http://namespaces.zope.org/browser"
- ... name="TestSkin" />
- ... ''')
-
- >>> print http(r"""
- ... GET /test_folder_1_/testoid/eagle.html HTTP/1.1
- ... """)
- HTTP/1.1 200 OK
- ...
- The eagle has landed
-
-
Clean up
--------
Modified: Zope/trunk/lib/python/Products/Five/component/__init__.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/component/__init__.py 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/Products/Five/component/__init__.py 2009-02-02 19:11:51 UTC (rev 95991)
@@ -19,7 +19,7 @@
import zope.component
import zope.event
from zope.component.interfaces import IComponentLookup
-from zope.app.component.interfaces import ISite, IPossibleSite
+from zope.location.interfaces import ISite, IPossibleSite
from zope.app.publication.zopepublication import BeforeTraverseEvent
import ExtensionClass
Modified: Zope/trunk/lib/python/Products/Five/component/component.txt
===================================================================
--- Zope/trunk/lib/python/Products/Five/component/component.txt 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/Products/Five/component/component.txt 2009-02-02 19:11:51 UTC (rev 95991)
@@ -20,7 +20,7 @@
>>> from OFS.ObjectManager import ObjectManager
>>> from zope.interface import alsoProvides
- >>> from zope.app.component.interfaces import ISite
+ >>> from zope.location.interfaces import ISite
>>> components = object()
>>> site = ObjectManager()
Modified: Zope/trunk/lib/python/Products/Five/component/configure.zcml
===================================================================
--- Zope/trunk/lib/python/Products/Five/component/configure.zcml 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/Products/Five/component/configure.zcml 2009-02-02 19:11:51 UTC (rev 95991)
@@ -4,7 +4,7 @@
<adapter factory=".siteManagerAdapter" />
<subscriber
- for="zope.app.component.interfaces.ISite
+ for="zope.location.interfaces.ISite
zope.app.publication.interfaces.IBeforeTraverseEvent"
handler="zope.app.component.site.threadSiteSubscriber"
/>
Modified: Zope/trunk/lib/python/Products/Five/component/interfaces.py
===================================================================
--- Zope/trunk/lib/python/Products/Five/component/interfaces.py 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/Products/Five/component/interfaces.py 2009-02-02 19:11:51 UTC (rev 95991)
@@ -15,7 +15,7 @@
$Id$
"""
-from zope.app.component.interfaces import ISite
+from zope.location.interfaces import ISite
from OFS.interfaces import IObjectManager
class IObjectManagerSite(IObjectManager, ISite):
Modified: Zope/trunk/lib/python/Products/Five/component/makesite.txt
===================================================================
--- Zope/trunk/lib/python/Products/Five/component/makesite.txt 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/Products/Five/component/makesite.txt 2009-02-02 19:11:51 UTC (rev 95991)
@@ -48,7 +48,7 @@
Now we ensure that the folder has been turned into a site:
- >>> from zope.app.component.interfaces import ISite
+ >>> from zope.location.interfaces import ISite
>>> ISite.providedBy(app.folder)
True
Modified: Zope/trunk/lib/python/Products/Five/meta.zcml
===================================================================
--- Zope/trunk/lib/python/Products/Five/meta.zcml 2009-02-02 18:39:50 UTC (rev 95990)
+++ Zope/trunk/lib/python/Products/Five/meta.zcml 2009-02-02 19:11:51 UTC (rev 95991)
@@ -19,23 +19,23 @@
<meta:complexDirective
name="class"
- schema="zope.app.component.metadirectives.IClassDirective"
+ schema="zope.security.metadirectives.IClassDirective"
handler=".metaconfigure.ClassDirective"
>
<meta:subdirective
name="implements"
- schema="zope.app.component.metadirectives.IImplementsSubdirective"
+ schema="zope.security.metadirectives.IImplementsSubdirective"
/>
<meta:subdirective
name="require"
- schema="zope.app.component.metadirectives.IRequireSubdirective"
+ schema="zope.security.metadirectives.IRequireSubdirective"
/>
<meta:subdirective
name="allow"
- schema="zope.app.component.metadirectives.IAllowSubdirective"
+ schema="zope.security.metadirectives.IAllowSubdirective"
/>
</meta:complexDirective>
More information about the Zope-Checkins
mailing list