[Checkins] SVN: zope.app.publisher/trunk/ use zope.container instead of zope.app.container

[Wolfgang Schnerring]

Log message for revision 95447:
  use zope.container instead of zope.app.container
  

Changed:
  U   zope.app.publisher/trunk/CHANGES.txt
  U   zope.app.publisher/trunk/setup.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directoryresource.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/configure.zcml

-=-
Modified: zope.app.publisher/trunk/CHANGES.txt
===================================================================
--- zope.app.publisher/trunk/CHANGES.txt	2009-01-29 16:25:56 UTC (rev 95446)
+++ zope.app.publisher/trunk/CHANGES.txt	2009-01-29 16:28:18 UTC (rev 95447)
@@ -5,6 +5,8 @@
 3.5.4 (unreleased)
 ==================
 
+- Use zope.container instead of zope.app.container.
+
 3.5.3 (2009-01-27)
 ==================
 

Modified: zope.app.publisher/trunk/setup.py
===================================================================
--- zope.app.publisher/trunk/setup.py	2009-01-29 16:25:56 UTC (rev 95446)
+++ zope.app.publisher/trunk/setup.py	2009-01-29 16:28:18 UTC (rev 95447)
@@ -47,6 +47,7 @@
                         'zope.app.publication',
                         'zope.component',
                         'zope.configuration',
+                        'zope.container',
                         'zope.contenttype',
                         'zope.datetime',
                         'zope.deferredimport',

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directoryresource.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directoryresource.py	2009-01-29 16:25:56 UTC (rev 95446)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directoryresource.py	2009-01-29 16:28:18 UTC (rev 95447)
@@ -28,7 +28,7 @@
 from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.app.publisher.browser.directoryresource import \
      DirectoryResourceFactory, DirectoryResource
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
 from zope.app.publisher.browser.fileresource import FileResource
 from zope.app.publisher.browser.pagetemplateresource import \
      PageTemplateResource

Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/configure.zcml
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/configure.zcml	2009-01-29 16:25:56 UTC (rev 95446)
+++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/configure.zcml	2009-01-29 16:28:18 UTC (rev 95447)
@@ -20,18 +20,18 @@
       />
 
   <view 
-      for="zope.app.container.interfaces.IItemContainer"
+      for="zope.container.interfaces.IItemContainer"
       type="zope.publisher.interfaces.xmlrpc.IXMLRPCRequest"
       provides="zope.publisher.interfaces.xmlrpc.IXMLRPCPublisher"
-      factory="zope.app.container.traversal.ItemTraverser"
+      factory="zope.container.traversal.ItemTraverser"
       permission="zope.Public"
       />
 
   <view 
-      for="zope.app.container.interfaces.IReadContainer"
+      for="zope.container.interfaces.IReadContainer"
       type="zope.publisher.interfaces.xmlrpc.IXMLRPCRequest"
       provides="zope.publisher.interfaces.xmlrpc.IXMLRPCPublisher"
-      factory="zope.app.container.traversal.ContainerTraverser"
+      factory="zope.container.traversal.ContainerTraverser"
       permission="zope.Public"
       />