[Checkins] SVN: zope.session/trunk/ - repair poor ZCML factoring
Fred L. Drake, Jr.
fdrake at gmail.com
Wed Apr 30 14:48:56 EDT 2008
Log message for revision 85925:
- repair poor ZCML factoring
- avoid artificial version inflation
Changed:
U zope.session/trunk/CHANGES.txt
U zope.session/trunk/setup.py
A zope.session/trunk/src/zope/session/adapters.zcml
A zope.session/trunk/src/zope/session/apidoc.zcml
A zope.session/trunk/src/zope/session/classes.zcml
U zope.session/trunk/src/zope/session/configure.zcml
A zope.session/trunk/src/zope/session/subscribers.zcml
-=-
Modified: zope.session/trunk/CHANGES.txt
===================================================================
--- zope.session/trunk/CHANGES.txt 2008-04-30 18:35:02 UTC (rev 85924)
+++ zope.session/trunk/CHANGES.txt 2008-04-30 18:48:55 UTC (rev 85925)
@@ -2,6 +2,11 @@
CHANGES
=======
+Version 3.5.1 (2008-04-30)
+
+- Split up the ZCML to make it possible to re-use more reasonably.
+
+
Version 3.5.0 (2008-03-11)
--------------------------
Modified: zope.session/trunk/setup.py
===================================================================
--- zope.session/trunk/setup.py 2008-04-30 18:35:02 UTC (rev 85924)
+++ zope.session/trunk/setup.py 2008-04-30 18:48:55 UTC (rev 85925)
@@ -24,7 +24,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='zope.session',
- version = '3.6.0dev',
+ version = '3.5.1dev',
author='Zope Corporation and Contributors',
author_email='zope3-dev at zope.org',
description='Zope 3 Session Support',
Added: zope.session/trunk/src/zope/session/adapters.zcml
===================================================================
--- zope.session/trunk/src/zope/session/adapters.zcml (rev 0)
+++ zope.session/trunk/src/zope/session/adapters.zcml 2008-04-30 18:48:55 UTC (rev 85925)
@@ -0,0 +1,20 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+ <adapter
+ factory=".session.ClientId"
+ permission="zope.Public"
+ />
+
+ <adapter
+ factory=".session.Session"
+ provides=".interfaces.ISession"
+ permission="zope.Public"
+ />
+
+ <adapter
+ factory=".session.Session"
+ provides="zope.traversing.interfaces.IPathAdapter"
+ name="session"
+ />
+
+</configure>
Property changes on: zope.session/trunk/src/zope/session/adapters.zcml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: zope.session/trunk/src/zope/session/apidoc.zcml
===================================================================
--- zope.session/trunk/src/zope/session/apidoc.zcml (rev 0)
+++ zope.session/trunk/src/zope/session/apidoc.zcml 2008-04-30 18:48:55 UTC (rev 85925)
@@ -0,0 +1,20 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:apidoc="http://namespaces.zope.org/apidoc"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
+ zcml:condition="have apidoc"
+ >
+
+ <apidoc:bookchapter
+ id="session"
+ title="Sessions"
+ doc_path="design.txt"
+ />
+ <apidoc:bookchapter
+ id="api"
+ title="API"
+ doc_path="api.txt"
+ parent="session"
+ />
+
+</configure>
Property changes on: zope.session/trunk/src/zope/session/apidoc.zcml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: zope.session/trunk/src/zope/session/classes.zcml
===================================================================
--- zope.session/trunk/src/zope/session/classes.zcml (rev 0)
+++ zope.session/trunk/src/zope/session/classes.zcml 2008-04-30 18:48:55 UTC (rev 85925)
@@ -0,0 +1,73 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+ <class class=".session.Session">
+ <allow interface=".interfaces.ISession" />
+ <implements interface="zope.traversing.interfaces.IPathAdapter" />
+ </class>
+
+ <class class=".http.CookieClientIdManager">
+ <require
+ interface=".http.ICookieClientIdManager"
+ permission="zope.Public"
+ />
+ <require
+ set_schema=".http.ICookieClientIdManager"
+ permission="zope.ManageServices"
+ />
+ <require
+ interface="zope.location.ILocation"
+ permission="zope.Public"
+ />
+ <require
+ set_schema="zope.location.ILocation"
+ permission="zope.ManageServices"
+ />
+ </class>
+
+ <class class=".session.PersistentSessionDataContainer">
+ <require
+ interface=".interfaces.ISessionDataContainer"
+ permission="zope.Public"
+ />
+ <require
+ set_schema=".interfaces.ISessionDataContainer"
+ permission="zope.ManageServices"
+ />
+ <require
+ interface="zope.location.ILocation"
+ permission="zope.Public"
+ />
+ <require
+ set_schema="zope.location.ILocation"
+ permission="zope.ManageServices"
+ />
+ </class>
+
+ <class class=".session.RAMSessionDataContainer">
+ <require
+ interface=".interfaces.ISessionDataContainer"
+ permission="zope.Public"
+ />
+ <require
+ set_schema=".interfaces.ISessionDataContainer"
+ permission="zope.ManageServices"
+ />
+ <require
+ interface="zope.location.ILocation"
+ permission="zope.Public"
+ />
+ <require
+ set_schema="zope.location.ILocation"
+ permission="zope.ManageServices"
+ />
+ </class>
+
+ <class class=".session.SessionData">
+ <allow interface=".interfaces.ISessionData" />
+ </class>
+
+ <class class=".session.SessionPkgData">
+ <allow interface=".interfaces.ISessionPkgData" />
+ </class>
+
+</configure>
Property changes on: zope.session/trunk/src/zope/session/classes.zcml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Modified: zope.session/trunk/src/zope/session/configure.zcml
===================================================================
--- zope.session/trunk/src/zope/session/configure.zcml 2008-04-30 18:35:02 UTC (rev 85924)
+++ zope.session/trunk/src/zope/session/configure.zcml 2008-04-30 18:48:55 UTC (rev 85925)
@@ -1,111 +1,8 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- i18n_domain="zope">
-
- <adapter
- factory=".session.ClientId"
- permission="zope.Public"
- />
+<configure xmlns="http://namespaces.zope.org/zope">
- <adapter
- factory=".session.Session"
- provides=".interfaces.ISession"
- permission="zope.Public"
- />
+ <include file="adapters.zcml" />
+ <include file="classes.zcml" />
+ <include file="subscribers.zcml" />
+ <include file="apidoc.zcml" />
- <adapter
- factory=".session.Session"
- provides="zope.traversing.interfaces.IPathAdapter"
- name="session"
- />
-
- <class class=".session.Session">
- <allow interface=".interfaces.ISession" />
- <implements interface="zope.traversing.interfaces.IPathAdapter" />
- </class>
-
- <class class=".http.CookieClientIdManager">
- <require
- interface=".http.ICookieClientIdManager"
- permission="zope.Public" />
- <require
- set_schema=".http.ICookieClientIdManager"
- permission="zope.ManageServices" />
- <require
- interface="zope.location.ILocation"
- permission="zope.Public" />
- <require
- set_schema="zope.location.ILocation"
- permission="zope.ManageServices" />
- </class>
-
- <class class=".session.PersistentSessionDataContainer">
- <require
- interface=".interfaces.ISessionDataContainer"
- permission="zope.Public" />
- <require
- set_schema=".interfaces.ISessionDataContainer"
- permission="zope.ManageServices" />
- <require
- interface="zope.location.ILocation"
- permission="zope.Public" />
- <require
- set_schema="zope.location.ILocation"
- permission="zope.ManageServices" />
- </class>
-
- <class class=".session.RAMSessionDataContainer">
- <require
- interface=".interfaces.ISessionDataContainer"
- permission="zope.Public" />
- <require
- set_schema=".interfaces.ISessionDataContainer"
- permission="zope.ManageServices" />
- <require
- interface="zope.location.ILocation"
- permission="zope.Public" />
- <require
- set_schema="zope.location.ILocation"
- permission="zope.ManageServices" />
- </class>
-
- <class class=".session.SessionData">
- <allow interface=".interfaces.ISessionData" />
- </class>
-
- <class class=".session.SessionPkgData">
- <allow interface=".interfaces.ISessionPkgData" />
- </class>
-
- <subscriber
- for="zope.app.appsetup.IDatabaseOpenedEvent"
- handler=".bootstrap.bootStrapSubscriber"
- />
-
- <subscriber
- for="zope.publisher.interfaces.http.IHTTPVirtualHostChangedEvent"
- handler=".http.notifyVirtualHostChanged"
- />
-
- <!-- Registering documentation with API doc -->
- <configure
- xmlns:apidoc="http://namespaces.zope.org/apidoc"
- xmlns:zcml="http://namespaces.zope.org/zcml"
- zcml:condition="have apidoc">
-
- <apidoc:bookchapter
- id="session"
- title="Sessions"
- doc_path="design.txt"
- />
- <apidoc:bookchapter
- id="api"
- title="API"
- doc_path="api.txt"
- parent="session"
- />
-
- </configure>
-
</configure>
Added: zope.session/trunk/src/zope/session/subscribers.zcml
===================================================================
--- zope.session/trunk/src/zope/session/subscribers.zcml (rev 0)
+++ zope.session/trunk/src/zope/session/subscribers.zcml 2008-04-30 18:48:55 UTC (rev 85925)
@@ -0,0 +1,13 @@
+<configure xmlns="http://namespaces.zope.org/zope">
+
+ <subscriber
+ for="zope.app.appsetup.IDatabaseOpenedEvent"
+ handler=".bootstrap.bootStrapSubscriber"
+ />
+
+ <subscriber
+ for="zope.publisher.interfaces.http.IHTTPVirtualHostChangedEvent"
+ handler=".http.notifyVirtualHostChanged"
+ />
+
+</configure>
Property changes on: zope.session/trunk/src/zope/session/subscribers.zcml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
More information about the Checkins
mailing list