[Zope3-checkins] CVS: Products3/z3checkins - configure.zcml:1.17 folder.py:1.5 interfaces.py:1.11 message.py:1.32

[Gintautas Miliauskas]

Update of /cvs-repository/Products3/z3checkins
In directory cvs.zope.org:/tmp/cvs-serv6316

Modified Files:
	configure.zcml folder.py interfaces.py message.py 
Log Message:
- Updated imports to work with the new hierarchy.
- Renamed CheckinsFolder to CheckinFolder


=== Products3/z3checkins/configure.zcml 1.16 => 1.17 ===
--- Products3/z3checkins/configure.zcml:1.16	Wed Mar  3 08:46:34 2004
+++ Products3/z3checkins/configure.zcml	Sun Mar 14 05:56:48 2004
@@ -12,7 +12,7 @@
              interface=".interfaces.IMessage" />
 
     <implements
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
 
   </content>
 
@@ -22,11 +22,11 @@
              interface=".interfaces.ICheckinMessage" />
 
     <implements
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
 
   </content>
 
-  <content class=".folder.CheckinsFolder">
+  <content class=".folder.CheckinFolder">
 
      <require permission="zope.View"
               interface="zope.app.container.interfaces.IReadContainer" />
@@ -35,13 +35,17 @@
               interface="zope.app.container.interfaces.IWriteContainer" />
 
      <require permission="zope.ManageContent"
-              set_schema=".interfaces.ICheckinsFolder" />
+              set_schema=".interfaces.ICheckinFolder" />
 
      <require permission="zope.View"
-              interface=".interfaces.ICheckinsFolderSchema" />
+              interface=".interfaces.ICheckinFolderSchema" />
+
+     <factory id="CheckinFolder"
+              title="Checkin Folder"
+              description="A checkin folder" />
 
      <implements
-       interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+       interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
 
   </content>
 
@@ -52,7 +56,7 @@
            permission="zope.View"
            provides=".interfaces.IMessageArchive" />
 
-  <adapter for=".interfaces.ICheckinsFolder"
+  <adapter for=".interfaces.ICheckinFolder"
            factory=".folder.MessageNameChooser"
            permission="zope.View"
            provides="zope.app.container.interfaces.INameChooser" />
@@ -105,24 +109,24 @@
 
   <browser:addform
     name="CheckinFolder"
-    schema=".interfaces.ICheckinsFolderSchema"
+    schema=".interfaces.ICheckinFolderSchema"
     fields="description archive_url icons"
     label="Create a checkin message folder"
     permission="zope.ManageContent"
-    content_factory=".folder.CheckinsFolder" />
+    content_factory=".folder.CheckinFolder" />
 
   <browser:addMenuItem
     title="Checkin Folder"
-    class=".folder.CheckinsFolder"
+    class=".folder.CheckinFolder"
     permission="zope.ManageContent"
     view="CheckinFolder" />
 
   <browser:view
     name="+"
     menu="zmi_actions" title="Add"
-    for=".interfaces.ICheckinsFolder"
+    for=".interfaces.ICheckinFolder"
     permission="zope.ManageContent"
-    class="zope.app.browser.container.adding.Adding">
+    class="zope.app.container.browser.adding.Adding">
 
    <page name="index.html" attribute="index" />
    <page name="action.html" attribute="action" />
@@ -131,7 +135,7 @@
 
   <browser:editform
     name="EditFolder"
-    schema=".interfaces.ICheckinsFolder"
+    schema=".interfaces.ICheckinFolder"
     label="Change properties of a checkin message folder"
     menu="zmi_views" title="Edit"
     permission="zope.ManageContent" />
@@ -224,21 +228,21 @@
 <!-- Browser views: containers -->
 
   <browser:page
-    for=".interfaces.ICheckinsFolder"
+    for=".interfaces.ICheckinFolder"
     name="checkins.rss"
     template="rss_container.pt"
     class=".message.ContainerView"
     permission="zope.View" />
 
   <browser:page
-    for=".interfaces.ICheckinsFolder"
+    for=".interfaces.ICheckinFolder"
     name="index.html"
     template="container.pt"
     class=".message.ContainerView"
     permission="zope.View" />
 
   <browser:page
-    for=".interfaces.ICheckinsFolder"
+    for=".interfaces.ICheckinFolder"
     name="checkins-sidebar.html"
     template="container.pt"
     usage="sidebar"


=== Products3/z3checkins/folder.py 1.4 => 1.5 ===
--- Products3/z3checkins/folder.py:1.4	Wed Mar  3 08:46:34 2004
+++ Products3/z3checkins/folder.py	Sun Mar 14 05:56:48 2004
@@ -11,12 +11,12 @@
 from zope.app.container.interfaces import INameChooser
 from zope.app.container.interfaces import IContainerNamesContainer
 from zope.app.size.interfaces import ISized
-from interfaces import ICheckinsFolder
+from interfaces import ICheckinFolder
 
-class CheckinsFolder(BTreeContainer):
+class CheckinFolder(BTreeContainer):
     """A message folder."""
     
-    implements(ICheckinsFolder, IContainerNamesContainer)
+    implements(ICheckinFolder, IContainerNamesContainer)
 
 
 class MessageNameChooser:


=== Products3/z3checkins/interfaces.py 1.10 => 1.11 ===
--- Products3/z3checkins/interfaces.py:1.10	Wed Mar  3 08:46:34 2004
+++ Products3/z3checkins/interfaces.py	Sun Mar 14 05:56:48 2004
@@ -54,7 +54,7 @@
         """
 
 
-class ICheckinsFolderSchema(Interface):
+class ICheckinFolderSchema(Interface):
     """Checkin folder properties"""
 
     description = TextLine(title=u"RSS view description",
@@ -68,7 +68,7 @@
     pass
 
 
-class ICheckinsFolder(IFolder, ICheckinsFolderSchema):
+class ICheckinFolder(IFolder, ICheckinFolderSchema):
     """A marker interface for the checkins folder."""
 
     def __setitem__(name, object):
@@ -80,7 +80,7 @@
 class IMessageContained(IContained):
     """A contained message."""
 
-    __parent__ = Field(constraint=ContainerTypesConstraint(ICheckinsFolder))
+    __parent__ = Field(constraint=ContainerTypesConstraint(ICheckinFolder))
 
 
 class IMessageArchive(Interface):


=== Products3/z3checkins/message.py 1.31 => 1.32 ===
--- Products3/z3checkins/message.py:1.31	Sat Mar  6 17:16:50 2004
+++ Products3/z3checkins/message.py	Sun Mar 14 05:56:48 2004
@@ -15,7 +15,7 @@
 from datetime import datetime, tzinfo, timedelta
 
 from persistence import Persistent
-from zope.app.browser.form.widget import FileWidget
+from zope.app.form.browser.widget import FileWidget
 from zope.app.container.interfaces import IReadContainer
 from zope.app.datetimeutils import parseDatetimetz, DateTimeError
 from zope.app.form.widget import CustomWidgetFactory