[Zope3-checkins] CVS: Zope3/src/zope/app/services - module.py:1.20 pagefolder.py:1.17 registration.py:1.20 service.py:1.36 zpt.py:1.17

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv19335/src/zope/app/services

Modified Files:
	module.py pagefolder.py registration.py service.py zpt.py 
Log Message:
rename z.a.fssync.classes to z.fssync.entryadapter


=== Zope3/src/zope/app/services/module.py 1.19 => 1.20 ===
--- Zope3/src/zope/app/services/module.py:1.19	Thu Dec 18 05:29:49 2003
+++ Zope3/src/zope/app/services/module.py	Tue Jan 13 14:32:23 2004
@@ -19,11 +19,11 @@
 from persistence import Persistent
 from zodb.code.module import PersistentModule, compileModule
 from zope.app.event import function
-from zope.app.fssync.classes import ObjectEntryAdapter, AttrMapping
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.interfaces.file import IFileFactory
-from zope.app.interfaces.fssync import IObjectFile
 from zope.app.interfaces.services.module import IModuleManager
+from zope.fssync.server.entryadapter import ObjectEntryAdapter, AttrMapping
+from zope.fssync.server.entryadapter import IObjectFile
 from zope.interface import implements
 from zope.security.proxy import trustedRemoveSecurityProxy
 from zope.app.container.contained import Contained


=== Zope3/src/zope/app/services/pagefolder.py 1.16 => 1.17 ===
--- Zope3/src/zope/app/services/pagefolder.py:1.16	Fri Nov 21 12:10:01 2003
+++ Zope3/src/zope/app/services/pagefolder.py	Tue Jan 13 14:32:23 2004
@@ -21,7 +21,7 @@
 __metaclass__ = type
 
 from zope.app.container.btree import BTreeContainer
-from zope.app.fssync.classes import ObjectEntryAdapter, AttrMapping
+from zope.fssync.server.entryadapter import ObjectEntryAdapter, AttrMapping
 from zope.app.interfaces.services.registration import ActiveStatus
 from zope.app.interfaces.services.registration import IRegistrationManager
 from zope.app.interfaces.services.registration import RegisteredStatus
@@ -39,7 +39,7 @@
 import zope.app.component.interfacefield
 import zope.app.interfaces.container
 import zope.app.interfaces.file
-import zope.app.interfaces.fssync
+import zope.fssync.server.interfaces
 import zope.app.interfaces.services.registration
 import zope.app.security.permission
 import zope.interface
@@ -172,7 +172,7 @@
 class PageFolderAdapter(ObjectEntryAdapter):
     """ObjectFile adapter for PageFolder objects."""
 
-    zope.interface.implements(zope.app.interfaces.fssync.IObjectDirectory)
+    zope.interface.implements(zope.fssync.server.interfaces.IObjectDirectory)
 
     def contents(self):
         return self.context.items()


=== Zope3/src/zope/app/services/registration.py 1.19 => 1.20 ===
--- Zope3/src/zope/app/services/registration.py:1.19	Fri Nov 21 12:09:56 2003
+++ Zope3/src/zope/app/services/registration.py	Tue Jan 13 14:32:23 2004
@@ -21,18 +21,22 @@
 
 from persistence import Persistent
 from zope.interface import implements
+from zope.fssync.server.interfaces import IObjectFile
+from zope.fssync.server.entryadapter import ObjectEntryAdapter
+from zope.proxy import removeAllProxies, getProxiedObject
+from zope.security.checker import InterfaceChecker, CheckerPublic
+from zope.security.proxy import Proxy, trustedRemoveSecurityProxy
+from zope.exceptions import DuplicationError
+from zope.xmlpickle import dumps, loads
+
+from zope.app.container.contained import Contained
+from zope.app.container.contained import setitem, contained, uncontained
 from zope.app.interfaces.annotation import IAttributeAnnotatable
 from zope.app.interfaces.container import IAddNotifiable, IRemoveNotifiable
 from zope.app.interfaces.dependable import IDependable, DependencyError
 from zope.app.interfaces.services import registration as interfaces
 from zope.app.interfaces.services.module import IModuleManager
-from zope.proxy import removeAllProxies
-from zope.security.checker import InterfaceChecker, CheckerPublic
-from zope.security.proxy import Proxy, trustedRemoveSecurityProxy
-from zope.proxy import getProxiedObject
-from zope.app.container.contained import Contained
-from zope.app.container.contained import setitem, contained, uncontained
-from zope.exceptions import DuplicationError
+
 
 class RegistrationStatusProperty(object):
 
@@ -752,11 +756,6 @@
         mod = self.findModule(name[:l])
         return getattr(mod, name[l+1:])
 
-
-
-from zope.xmlpickle import dumps, loads
-from zope.app.interfaces.fssync import IObjectFile
-from zope.app.fssync.classes import ObjectEntryAdapter
 
 class ComponentRegistrationAdapter(ObjectEntryAdapter):
 


=== Zope3/src/zope/app/services/service.py 1.35 => 1.36 ===
--- Zope3/src/zope/app/services/service.py:1.35	Mon Jan 12 17:53:00 2004
+++ Zope3/src/zope/app/services/service.py	Tue Jan 13 14:32:23 2004
@@ -28,22 +28,31 @@
 
 import sys
 
-from zope.app import zapi
+from transaction import get_transaction
 from zodb.code.module import PersistentModuleRegistry
 
 import zope.interface
-import zope.app.interfaces.services.registration
 
 from zope.component import getServiceManager
 from zope.component.exceptions import ComponentLookupError
-
+from zope.fssync.server.entryadapter import AttrMapping
 from zope.proxy import removeAllProxies
 
+
+import zope.app.interfaces.services.registration
+
+from zope.app import zapi
+
+from zope.app.event.function import Subscriber
+from zope.app.interfaces.services.service import IPossibleSite
+
 from zope.app.component.nextservice import getNextService
 from zope.app.component.nextservice import getNextServiceManager
 
 from zope.app.container.constraints import ItemTypePrecondition
 
+from zope.app.content.fssync import DirectoryAdapter
+
 from zope.app.interfaces.container import IContainer
 from zope.app.interfaces.services.service import IBindingAware
 from zope.app.interfaces.services.service import IServiceRegistration
@@ -62,6 +71,7 @@
 from zope.app.interfaces.services.service import ISite
 from zope.app.location import inside
 
+
 class IRegistrationManagerContainerContainer(zope.interface.Interface):
 
     def __setitem__(name, folder):
@@ -307,9 +317,6 @@
 
 # Fssync stuff
 
-from zope.app.fssync.classes import AttrMapping
-from zope.app.content.fssync import DirectoryAdapter
-
 _smattrs = (
     '_modules',                         # PersistentModuleRegistry
     '_bindings',                        # NameComponentRegistry
@@ -323,12 +330,6 @@
 
 #BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 
-
-
-from zope.app.event.function import Subscriber
-from transaction import get_transaction
-from zope.component.exceptions import ComponentLookupError
-from zope.app.interfaces.services.service import IPossibleSite
 
 def fixup(event):
     database = event.database


=== Zope3/src/zope/app/services/zpt.py 1.16 => 1.17 ===
--- Zope3/src/zope/app/services/zpt.py:1.16	Mon Dec 15 09:59:13 2003
+++ Zope3/src/zope/app/services/zpt.py	Tue Jan 13 14:32:23 2004
@@ -19,9 +19,9 @@
 import persistence
 import re
 import zope.app.container.contained
-import zope.app.fssync.classes
+import zope.fssync.server.entryadapter
+import zope.fssync.server.interfaces
 import zope.app.interfaces.file
-import zope.app.interfaces.fssync
 import zope.app.interfaces.index.text
 import zope.app.interfaces.services.registration
 import zope.app.pagetemplate.engine
@@ -169,10 +169,10 @@
         return r
 
 
-class ZPTPageAdapter(zope.app.fssync.classes.ObjectEntryAdapter):
+class ZPTPageAdapter(zope.fssync.server.entryadapter.ObjectEntryAdapter):
     """ObjectFile adapter for ZPTTemplate objects."""
 
-    zope.interface.implements(zope.app.interfaces.fssync.IObjectFile)
+    zope.interface.implements(zope.fssync.server.entryadapter.IObjectFile)
 
     def getBody(self):
         return self.context.source
@@ -184,5 +184,5 @@
         self.context.source = unicode(data)
 
     def extra(self):
-        return zope.app.fssync.classes.AttrMapping(
+        return zope.fssync.server.entryadapter.AttrMapping(
             self.context, ('contentType', 'expand'))