[Zope3-checkins] SVN: Zope3/trunk/ A handler attribute is now used
in subscriber directives for
Jim Fulton
jim at zope.com
Thu Jan 27 19:57:08 EST 2005
Log message for revision 28969:
A handler attribute is now used in subscriber directives for
event subscribers that don't create objects, which is the case
for most subscribers. Using the factory attribute without a
provides attribute to register a handler is deprecated.
Changed:
U Zope3/trunk/doc/CHANGES.txt
U Zope3/trunk/doc/TODO.txt
U Zope3/trunk/src/bugtracker/configure.zcml
U Zope3/trunk/src/zope/app/appsetup/configure.zcml
U Zope3/trunk/src/zope/app/authentication/groupfolder.zcml
U Zope3/trunk/src/zope/app/authentication/principalplugins.zcml
U Zope3/trunk/src/zope/app/broken/configure.zcml
U Zope3/trunk/src/zope/app/catalog/configure.zcml
U Zope3/trunk/src/zope/app/component/configure.zcml
U Zope3/trunk/src/zope/app/component/metaconfigure.py
U Zope3/trunk/src/zope/app/component/metadirectives.py
U Zope3/trunk/src/zope/app/component/tests/test_directives.py
U Zope3/trunk/src/zope/app/container/configure.zcml
U Zope3/trunk/src/zope/app/dublincore/configure.zcml
U Zope3/trunk/src/zope/app/error/configure.zcml
U Zope3/trunk/src/zope/app/event/configure.zcml
U Zope3/trunk/src/zope/app/generations/subscriber.zcml
U Zope3/trunk/src/zope/app/i18n/configure.zcml
U Zope3/trunk/src/zope/app/intid/configure.zcml
U Zope3/trunk/src/zope/app/module/configure.zcml
U Zope3/trunk/src/zope/app/observable/configure.zcml
U Zope3/trunk/src/zope/app/pluggableauth/configure.zcml
U Zope3/trunk/src/zope/app/presentation/configure.zcml
U Zope3/trunk/src/zope/app/principalannotation/configure.zcml
U Zope3/trunk/src/zope/app/registration/configure.zcml
U Zope3/trunk/src/zope/app/security/configure.zcml
U Zope3/trunk/src/zope/app/securitypolicy/configure.zcml
U Zope3/trunk/src/zope/app/session/configure.zcml
U Zope3/trunk/src/zope/app/site/configure.zcml
U Zope3/trunk/src/zope/app/undo/configure.zcml
U Zope3/trunk/src/zope/app/workflow/stateful/configure.zcml
U Zope3/trunk/src/zwiki/configure.zcml
-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/doc/CHANGES.txt 2005-01-28 00:57:08 UTC (rev 28969)
@@ -10,6 +10,12 @@
New features
+ - A handler attribute is now used in subscriber directives for
+ event subscribers that don't create objects, which is the case
+ for most subscribers. Using the factory attribute without a
+ provides attribute to register a handler is deprecated.
+
+
- It is no longer necessary to supply a for attribute in adapter
directives if the factory declares the interfaces or classes that it
adapts.
Modified: Zope3/trunk/doc/TODO.txt
===================================================================
--- Zope3/trunk/doc/TODO.txt 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/doc/TODO.txt 2005-01-28 00:57:08 UTC (rev 28969)
@@ -36,25 +36,7 @@
interfaces. This has been done for page directives but needs to be
done for other adapter directives.
-- Add a handler attribute to the subscriber directive. Deprecate use
- of `factory` attribute without a `provides` attribute. So, you can
- have::
- <subscriber handler=".myfunc" for="ISomeEvent" />
-
- or::
-
- <subscriber factory=".myclass" for="IFoo" provides="IBar" />
-
- But not::
-
- <subscriber factory=".myfunc" for="ISomeEvent" />
-
- or::
-
- <subscriber handler=".myclass" for="IFoo" provides="IBar" />
-
-
Miscellaneous
-------------
Modified: Zope3/trunk/src/bugtracker/configure.zcml
===================================================================
--- Zope3/trunk/src/bugtracker/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/bugtracker/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -372,7 +372,7 @@
<!-- Register event listener for change mails -->
<subscriber
- factory=".mail.Mailer"
+ handler=".mail.Mailer"
for="zope.app.event.interfaces.IObjectCreatedEvent
zope.app.event.interfaces.IObjectModifiedEvent" />
Modified: Zope3/trunk/src/zope/app/appsetup/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/appsetup/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/appsetup/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -1,7 +1,7 @@
<configure xmlns="http://namespaces.zope.org/zope">
<subscriber
- factory=".bootstrap.bootStrapSubscriber"
+ handler=".bootstrap.bootStrapSubscriber"
for="zope.app.appsetup.IDatabaseOpenedEvent"
/>
Modified: Zope3/trunk/src/zope/app/authentication/groupfolder.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/groupfolder.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/authentication/groupfolder.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -18,7 +18,7 @@
</content>
<subscriber
- factory=".groupfolder.setGroupsForPrincipal"
+ handler=".groupfolder.setGroupsForPrincipal"
for=".interfaces.IPrincipalCreated"
/>
Modified: Zope3/trunk/src/zope/app/authentication/principalplugins.zcml
===================================================================
--- Zope3/trunk/src/zope/app/authentication/principalplugins.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/authentication/principalplugins.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -12,7 +12,7 @@
<subscriber
for=".interfaces.IPrincipalCreated"
- factory=".principalplugins.addTitleAndDescription"
+ handler=".principalplugins.addTitleAndDescription"
/>
</configure>
Modified: Zope3/trunk/src/zope/app/broken/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/broken/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/broken/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -6,7 +6,7 @@
</content>
<subscriber
- factory=".broken.installBroken"
+ handler=".broken.installBroken"
for="zope.app.appsetup.IDatabaseOpenedEvent"
/>
Modified: Zope3/trunk/src/zope/app/catalog/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/catalog/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/catalog/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -28,23 +28,23 @@
</content>
<subscriber
- factory=".catalog.indexAdded"
+ handler=".catalog.indexAdded"
for=".interfaces.ICatalogIndex
zope.app.container.interfaces.IObjectAddedEvent"
/>
<subscriber
- factory=".catalog.indexDocSubscriber"
+ handler=".catalog.indexDocSubscriber"
for="zope.app.intid.interfaces.IIntIdAddedEvent"
/>
<subscriber
- factory=".catalog.reindexDocSubscriber"
+ handler=".catalog.reindexDocSubscriber"
for="zope.app.event.objectevent.IObjectModifiedEvent"
/>
<subscriber
- factory=".catalog.unindexDocSubscriber"
+ handler=".catalog.unindexDocSubscriber"
for="zope.app.intid.interfaces.IIntIdRemovedEvent"
/>
Modified: Zope3/trunk/src/zope/app/component/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/component/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/component/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -31,12 +31,12 @@
for="zope.interface.Interface" />
<subscriber
- factory=".localservice.threadSiteSubscriber"
+ handler=".localservice.threadSiteSubscriber"
for="zope.app.publication.interfaces.IBeforeTraverseEvent"
/>
<subscriber
- factory=".localservice.clearThreadSiteSubscriber"
+ handler=".localservice.clearThreadSiteSubscriber"
for="zope.app.publication.interfaces.IEndRequestEvent"
/>
Modified: Zope3/trunk/src/zope/app/component/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/component/metaconfigure.py 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/component/metaconfigure.py 2005-01-28 00:57:08 UTC (rev 28969)
@@ -77,8 +77,27 @@
return ob
-def subscriber(_context, factory, for_, provides=None, permission=None,
- trusted=False):
+_handler=handler
+def subscriber(_context, for_, factory=None, handler=None, provides=None,
+ permission=None, trusted=False):
+
+ if factory is None:
+ if handler is None:
+ raise TypeError("No factory or handler provides")
+ if provides is not None:
+ raise TypeError("Cannot use handler with provides")
+ factory = handler
+ else:
+ if handler is not None:
+ raise TypeError("Cannot use handler with factory")
+ if provides is None:
+ import warnings
+ warnings.warn(
+ "Use of factory without provides to indicate a handler "
+ "is deprecated and will change it's meaning in Zope X3.3. "
+ "Use the handler attribute instead.",
+ DeprecationWarning)
+
factory = [factory]
if permission is not None:
@@ -108,7 +127,7 @@
_context.action(
discriminator = None,
- callable = handler,
+ callable = _handler,
args = (zapi.servicenames.Adapters, 'subscribe',
for_, provides, factory),
)
Modified: Zope3/trunk/src/zope/app/component/metadirectives.py
===================================================================
--- Zope3/trunk/src/zope/app/component/metadirectives.py 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/component/metadirectives.py 2005-01-28 00:57:08 UTC (rev 28969)
@@ -221,9 +221,15 @@
factory = zope.configuration.fields.GlobalObject(
title=_("Subscriber factory"),
description=_("A factory used to create the subscriber instance."),
- required=True
+ required=False,
)
+ handler = zope.configuration.fields.GlobalObject(
+ title=_("Handler"),
+ description=_("A callable object that handles events."),
+ required=False,
+ )
+
provides = zope.configuration.fields.GlobalInterface(
title=_("Interface the component provides"),
description=_("This attribute specifes the interface the adapter"
Modified: Zope3/trunk/src/zope/app/component/tests/test_directives.py
===================================================================
--- Zope3/trunk/src/zope/app/component/tests/test_directives.py 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/component/tests/test_directives.py 2005-01-28 00:57:08 UTC (rev 28969)
@@ -174,7 +174,7 @@
<subscriber
for="zope.component.tests.components.IContent
zope.app.component.tests.adapter.I1"
- factory="zope.app.component.tests.adapter.Handler"
+ handler="zope.app.component.tests.adapter.Handler"
/>
"""
)))
Modified: Zope3/trunk/src/zope/app/container/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/container/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/container/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -44,7 +44,7 @@
/>
<subscriber
- factory=".dependency.CheckDependency"
+ handler=".dependency.CheckDependency"
for="zope.app.container.interfaces.IObjectRemovedEvent"
trusted="y"
/>
@@ -52,7 +52,7 @@
<subscriber
for="zope.app.location.interfaces.ILocation
zope.app.container.interfaces.IObjectMovedEvent"
- factory=".contained.dispatchToSublocations"
+ handler=".contained.dispatchToSublocations"
>
Handler dispatches moved events to sublocations of the original object.
</subscriber>
Modified: Zope3/trunk/src/zope/app/dublincore/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/dublincore/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/dublincore/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -32,22 +32,22 @@
</class>
<subscriber
- factory=".timeannotators.ModifiedAnnotator"
+ handler=".timeannotators.ModifiedAnnotator"
for="zope.app.event.interfaces.IObjectModifiedEvent"
/>
<subscriber
- factory=".timeannotators.CreatedAnnotator"
+ handler=".timeannotators.CreatedAnnotator"
for="zope.app.event.interfaces.IObjectCreatedEvent"
/>
<subscriber
- factory=".creatorannotator.CreatorAnnotator"
+ handler=".creatorannotator.CreatorAnnotator"
for="zope.app.event.interfaces.IObjectModifiedEvent"
/>
<subscriber
- factory=".creatorannotator.CreatorAnnotator"
+ handler=".creatorannotator.CreatorAnnotator"
for="zope.app.event.interfaces.IObjectCreatedEvent"
/>
Modified: Zope3/trunk/src/zope/app/error/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/error/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/error/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -38,7 +38,7 @@
<subscriber
for="zope.app.appsetup.IDatabaseOpenedEvent"
- factory=".bootstrap.bootStrapSubscriber"
+ handler=".bootstrap.bootStrapSubscriber"
/>
<include package=".browser" />
Modified: Zope3/trunk/src/zope/app/event/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/event/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/event/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -5,7 +5,7 @@
<subscriber
for="zope.app.event.interfaces.IObjectEvent"
- factory=".objectevent.objectEventNotify"
+ handler=".objectevent.objectEventNotify"
/>
</configure>
Modified: Zope3/trunk/src/zope/app/generations/subscriber.zcml
===================================================================
--- Zope3/trunk/src/zope/app/generations/subscriber.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/generations/subscriber.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -2,7 +2,7 @@
<!--
<subscriber
- factory=".generations.evolveSubscriber"
+ handler=".generations.evolveSubscriber"
for="zope.app.appsetup.IDatabaseOpenedEvent"
>
Evolve to current generation on startup
@@ -11,7 +11,7 @@
<!--
<subscriber
- factory=".generations.evolveNotSubscriber"
+ handler=".generations.evolveNotSubscriber"
for="zope.app.appsetup.IDatabaseOpenedEvent"
>
Don't evolve, but check for minimum generations on startup
@@ -19,7 +19,7 @@
-->
<subscriber
- factory=".generations.evolveMinimumSubscriber"
+ handler=".generations.evolveMinimumSubscriber"
for="zope.app.appsetup.IDatabaseOpenedEvent"
>
Only evolve to minimum generations on startup
Modified: Zope3/trunk/src/zope/app/i18n/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/i18n/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/i18n/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -38,12 +38,12 @@
<subscriber
for="..registration.interfaces.IRegistrationActivatedEvent"
- factory=".translationdomain.setDomainOnActivation"
+ handler=".translationdomain.setDomainOnActivation"
/>
<subscriber
for="..registration.interfaces.IRegistrationDeactivatedEvent"
- factory=".translationdomain.unsetDomainOnDeactivation"
+ handler=".translationdomain.unsetDomainOnDeactivation"
/>
<!-- Setup Message Catalogs -->
Modified: Zope3/trunk/src/zope/app/intid/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/intid/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/intid/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -26,13 +26,13 @@
</localUtility>
<subscriber
- factory=".removeIntIdSubscriber"
+ handler=".removeIntIdSubscriber"
for="zope.app.location.interfaces.ILocation
zope.app.container.interfaces.IObjectRemovedEvent"
/>
<subscriber
- factory=".addIntIdSubscriber"
+ handler=".addIntIdSubscriber"
for="zope.app.location.interfaces.ILocation
zope.app.container.interfaces.IObjectAddedEvent"
/>
Modified: Zope3/trunk/src/zope/app/module/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/module/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/module/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -18,7 +18,7 @@
<!-- Enable import of persistent modules -->
<subscriber
- factory=".installPersistentModuleImporter"
+ handler=".installPersistentModuleImporter"
for="zope.app.appsetup.IProcessStartingEvent"
/>
Modified: Zope3/trunk/src/zope/app/observable/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/observable/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/observable/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -7,7 +7,7 @@
/>
<subscriber
- factory=".observerevent.observerEventNotifier"
+ handler=".observerevent.observerEventNotifier"
for="zope.app.event.interfaces.IObjectEvent"
/>
Modified: Zope3/trunk/src/zope/app/pluggableauth/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/pluggableauth/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/pluggableauth/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -29,7 +29,7 @@
<subscriber
for=".interfaces.IPluggableAuthenticationService
zope.app.container.interfaces.IObjectAddedEvent"
- factory=".PluggableAuthenticationServiceAddSubscriber"
+ handler=".PluggableAuthenticationServiceAddSubscriber"
/>
<content class=".BTreePrincipalSource">
Modified: Zope3/trunk/src/zope/app/presentation/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/presentation/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/presentation/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -20,13 +20,13 @@
</content>
<subscriber
- factory=".presentation.PageRegistrationAddSubscriber"
+ handler=".presentation.PageRegistrationAddSubscriber"
for=".presentation.IPageRegistration
zope.app.container.interfaces.IObjectAddedEvent"
/>
<subscriber
- factory=".presentation.PageRegistrationRemoveSubscriber"
+ handler=".presentation.PageRegistrationRemoveSubscriber"
for=".presentation.IPageRegistration
zope.app.container.interfaces.IObjectRemovedEvent"
/>
Modified: Zope3/trunk/src/zope/app/principalannotation/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/principalannotation/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/principalannotation/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -23,7 +23,7 @@
<subscriber
for="zope.app.appsetup.IDatabaseOpenedEvent"
- factory=".bootstrap.bootStrapSubscriber"
+ handler=".bootstrap.bootStrapSubscriber"
/>
</configure>
Modified: Zope3/trunk/src/zope/app/registration/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/registration/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/registration/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -62,25 +62,25 @@
</content>
<subscriber
- factory=".registration.SimpleRegistrationRemoveSubscriber"
+ handler=".registration.SimpleRegistrationRemoveSubscriber"
for=".interfaces.IRegistration
zope.app.container.interfaces.IObjectRemovedEvent"
/>
<subscriber
- factory=".registration.ComponentRegistrationRemoveSubscriber"
+ handler=".registration.ComponentRegistrationRemoveSubscriber"
for=".interfaces.IComponentRegistration
zope.app.container.interfaces.IObjectRemovedEvent"
/>
<subscriber
- factory=".registration.ComponentRegistrationAddSubscriber"
+ handler=".registration.ComponentRegistrationAddSubscriber"
for=".interfaces.IComponentRegistration
zope.app.container.interfaces.IObjectAddedEvent"
/>
<subscriber
- factory=".registration.RegisterableMoveSubscriber"
+ handler=".registration.RegisterableMoveSubscriber"
for=".interfaces.IRegisterable
zope.app.container.interfaces.IObjectMovedEvent"
/>
Modified: Zope3/trunk/src/zope/app/security/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/security/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/security/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -41,12 +41,12 @@
<subscriber
for="..registration.interfaces.IRegistrationActivatedEvent"
- factory=".permission.setIdOnActivation"
+ handler=".permission.setIdOnActivation"
/>
<subscriber
for="..registration.interfaces.IRegistrationDeactivatedEvent"
- factory=".permission.unsetIdOnDeactivation"
+ handler=".permission.unsetIdOnDeactivation"
/>
<content class=".permission.Permission">
Modified: Zope3/trunk/src/zope/app/securitypolicy/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/securitypolicy/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -70,12 +70,12 @@
<subscriber
for="..registration.interfaces.IRegistrationActivatedEvent"
- factory=".role.setIdOnActivation"
+ handler=".role.setIdOnActivation"
/>
<subscriber
for="..registration.interfaces.IRegistrationDeactivatedEvent"
- factory=".role.unsetIdOnDeactivation"
+ handler=".role.unsetIdOnDeactivation"
/>
<!-- Include browser package -->
Modified: Zope3/trunk/src/zope/app/session/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/session/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/session/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -66,7 +66,7 @@
<subscriber
for="zope.app.appsetup.IDatabaseOpenedEvent"
- factory=".bootstrap.bootStrapSubscriber"
+ handler=".bootstrap.bootStrapSubscriber"
/>
<include file="browser.zcml" />
Modified: Zope3/trunk/src/zope/app/site/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/site/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/site/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -8,12 +8,12 @@
<subscriber
for="..registration.interfaces.IRegistrationActivatedEvent"
- factory=".service.handleActivated"
+ handler=".service.handleActivated"
/>
<subscriber
for="..registration.interfaces.IRegistrationDeactivatedEvent"
- factory=".service.handleDeactivated"
+ handler=".service.handleDeactivated"
/>
<!-- Service Manager -->
Modified: Zope3/trunk/src/zope/app/undo/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/undo/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/undo/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -20,7 +20,7 @@
<subscriber
- factory=".undoSetup"
+ handler=".undoSetup"
for="zope.app.appsetup.IDatabaseOpenedEvent"
/>
Modified: Zope3/trunk/src/zope/app/workflow/stateful/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/workflow/stateful/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zope/app/workflow/stateful/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -125,7 +125,7 @@
<subscriber
for="..interfaces.IProcessInstanceContainerAdaptable
zope.app.event.objectevent.IObjectCreatedEvent"
- factory=".contentworkflow.NewObjectProcessInstanceCreator"
+ handler=".contentworkflow.NewObjectProcessInstanceCreator"
/>
<!-- Test Object for testing Stateful Workflows -->
Modified: Zope3/trunk/src/zwiki/configure.zcml
===================================================================
--- Zope3/trunk/src/zwiki/configure.zcml 2005-01-28 00:51:41 UTC (rev 28968)
+++ Zope3/trunk/src/zwiki/configure.zcml 2005-01-28 00:57:08 UTC (rev 28969)
@@ -261,15 +261,15 @@
<!-- Register event listener for change mails -->
<subscriber
- factory=".wikipage.mailer"
+ handler=".wikipage.mailer"
for="zope.app.container.interfaces.IObjectAddedEvent"
/>
<subscriber
- factory=".wikipage.mailer"
+ handler=".wikipage.mailer"
for="zope.app.container.interfaces.IObjectRemovedEvent"
/>
<subscriber
- factory=".wikipage.mailer"
+ handler=".wikipage.mailer"
for=".interfaces.IWikiPageEditEvent"
/>
More information about the Zope3-Checkins
mailing list