[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZMI/tests - testTabsDirective.py:1.1.2.9 testZMIViewService.py:1.1.2.8 testZMIViewUtility.py:1.1.2.11

[Christian Theune]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ZMI/tests
In directory cvs.zope.org:/tmp/cvs-serv26313/lib/python/Zope/App/ZMI/tests

Modified Files:
      Tag: Zope-3x-branch
	testTabsDirective.py testZMIViewService.py 
	testZMIViewUtility.py 
Log Message:
Merged the ctheune-services_move-branch to Zope-3x-branch

- Moved Zope.App.OFS.ServiceManager into the Zope.App.OFS.Services package
- Moved Zope.App.OFS.RoleService into the Zope.App.OFS.Services package



=== Zope3/lib/python/Zope/App/ZMI/tests/testTabsDirective.py 1.1.2.8 => 1.1.2.9 ===
 from Zope.App.ZMI.tests.sampleInterfaces import *
 
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup\
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup\
            import PlacefulSetup
 from Zope.ComponentArchitecture import getService
 


=== Zope3/lib/python/Zope/App/ZMI/tests/testZMIViewService.py 1.1.2.7 => 1.1.2.8 ===
 from Zope.App.ZMI.ZMIViewService import ZMIViewService
 from Zope.App.ZMI.tests.sampleInterfaces import *
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup\
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup\
            import PlacefulSetup
 
 


=== Zope3/lib/python/Zope/App/ZMI/tests/testZMIViewUtility.py 1.1.2.10 => 1.1.2.11 ===
 from Zope.App.ZMI.IZMIViewService import IZMIViewService
 from Zope.ComponentArchitecture import getService, getServiceManager
-from Zope.App.OFS.ServiceManager.tests.PlacefulSetup\
+from Zope.App.OFS.Services.ServiceManager.tests.PlacefulSetup\
            import PlacefulSetup
 from Zope.App.ZMI.ZMIViewUtility import ZMIViewUtility
 from Zope.Publisher.Browser.IBrowserPublisher import IBrowserPublisher