[Zope-CVS] CVS: Products/AdaptableStorage - Zope2Mapper.py:1.10
Shane Hathaway
shane@zope.com
Mon, 10 Feb 2003 22:46:04 -0500
Update of /cvs-repository/Products/AdaptableStorage
In directory cvs.zope.org:/tmp/cvs-serv3749
Modified Files:
Zope2Mapper.py
Log Message:
Rearranged aspects for consistency
=== Products/AdaptableStorage/Zope2Mapper.py 1.9 => 1.10 ===
--- Products/AdaptableStorage/Zope2Mapper.py:1.9 Thu Feb 6 13:38:53 2003
+++ Products/AdaptableStorage/Zope2Mapper.py Mon Feb 10 22:46:00 2003
@@ -58,9 +58,9 @@
m = root_mapper.addSubMapper('OFS.Folder.Folder')
s = ObjectSerializer('OFS.Folder', 'Folder')
m.setSerializer(s)
- s.addAspect('items', folder_items_aspect)
- s.addAspect('properties', properties_aspect)
s.addAspect('id', id_aspect)
+ s.addAspect('properties', properties_aspect)
+ s.addAspect('items', folder_items_aspect)
s.addAspect('remainder', remainder_aspect)
classifier.registerDefaultLoader('Folder', 'OFS.Folder.Folder', 1)
@@ -92,9 +92,9 @@
s = ObjectSerializer('Products.PageTemplates.ZopePageTemplate',
'ZopePageTemplate')
m.setSerializer(s)
- s.addAspect('text', StringDataAttribute('_text'))
- s.addAspect('properties', properties_aspect)
s.addAspect('id', id_aspect)
+ s.addAspect('properties', properties_aspect)
+ s.addAspect('text', StringDataAttribute('_text'))
s.addAspect('remainder', remainder_aspect)
classifier.register('Page Template', 'ZopePageTemplate', (
'.html', '.htm', '.zpt', '.pt'))
@@ -103,8 +103,8 @@
m = root_mapper.addSubMapper('OFS.DTMLMethod.DTMLMethod')
s = ObjectSerializer('OFS.DTMLMethod', 'DTMLMethod')
m.setSerializer(s)
- s.addAspect('text', StringDataAttribute('raw'))
s.addAspect('id', id_aspect)
+ s.addAspect('text', StringDataAttribute('raw'))
s.addAspect('remainder', remainder_aspect)
classifier.register('DTML Method', 'OFS.DTMLMethod.DTMLMethod', ('.dtml',))
@@ -112,9 +112,9 @@
m = root_mapper.addSubMapper('OFS.DTMLDocument.DTMLDocument')
s = ObjectSerializer('OFS.DTMLDocument', 'DTMLDocument')
m.setSerializer(s)
- s.addAspect('text', StringDataAttribute('raw'))
- s.addAspect('properties', properties_aspect)
s.addAspect('id', id_aspect)
+ s.addAspect('properties', properties_aspect)
+ s.addAspect('text', StringDataAttribute('raw'))
s.addAspect('remainder', remainder_aspect)
classifier.register('DTML Document', 'OFS.DTMLDocument.DTMLDocument')
@@ -122,9 +122,9 @@
m = root_mapper.addSubMapper('Products.ZSQLMethods.SQL.SQL')
s = ObjectSerializer('Products.ZSQLMethods.SQL', 'SQL')
m.setSerializer(s)
- s.addAspect('text', ZSQLMethodSerializer())
- s.addAspect('properties', ZSQLMethodPropertiesSerializer())
s.addAspect('id', id_aspect)
+ s.addAspect('properties', ZSQLMethodPropertiesSerializer())
+ s.addAspect('text', ZSQLMethodSerializer())
s.addAspect('remainder', remainder_aspect)
classifier.register('Z SQL Method', 'Products.ZSQLMethods.SQL.SQL', (
'.sql', ))
@@ -134,8 +134,8 @@
s = ObjectSerializer('Products.PythonScripts.PythonScript',
'PythonScript')
m.setSerializer(s)
- s.addAspect('body', PythonScriptSerializer())
s.addAspect('id', id_aspect)
+ s.addAspect('body', PythonScriptSerializer())
s.addAspect('remainder', remainder_aspect)
classifier.register('Script (Python)', 'PythonScript', ('.py', ))
@@ -143,8 +143,8 @@
m = root_mapper.addSubMapper('AccessControl.User.UserFolder')
s = ObjectSerializer('AccessControl.User', 'UserFolder')
m.setSerializer(s)
- s.addAspect('data', UserFolderSerializer())
s.addAspect('id', id_aspect)
+ s.addAspect('data', UserFolderSerializer())
s.addAspect('remainder', remainder_aspect)
classifier.register('User Folder', 'AccessControl.User.UserFolder')
@@ -152,9 +152,9 @@
m = root_mapper.addSubMapper('anyfolder')
s = AnyObjectSerializer()
m.setSerializer(s)
- s.addAspect('items', folder_items_aspect)
- s.addAspect('properties', OptionalAspect(properties_aspect, []))
s.addAspect('id', id_aspect)
+ s.addAspect('properties', OptionalAspect(properties_aspect, []))
+ s.addAspect('items', folder_items_aspect)
s.addAspect('remainder', remainder_aspect)
classifier.registerDefaultStorage('(folderish object)', 'anyfolder', 1)