[Zope3-checkins] CVS: Zope3/src/zope/app/utilities - configure.zcml:1.1.2.9 content.py:1.1.2.2 instance.py:1.1.2.6 mutableschemafield.py:1.1.2.3 schema.py:1.1.2.17

[Sidnei da Silva]

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

Modified Files:
      Tag: dreamcatcher-ttwschema-branch
	configure.zcml content.py instance.py mutableschemafield.py 
	schema.py 
Log Message:
Fixed (hopefully) all missing imports

=== Zope3/src/zope/app/utilities/configure.zcml 1.1.2.8 => 1.1.2.9 ===
--- Zope3/src/zope/app/utilities/configure.zcml:1.1.2.8	Fri Aug 15 10:04:56 2003
+++ Zope3/src/zope/app/utilities/configure.zcml	Fri Aug 15 13:11:41 2003
@@ -17,12 +17,12 @@
 
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.utilities.IMutableSchema" />
+        interface="zope.app.interfaces.utilities.schema.IMutableSchema" />
 
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.utilities.ISchemaUtility"
-        set_schema="zope.app.interfaces.utilities.ISchemaUtility" />
+        interface="zope.app.interfaces.utilities.schema.ISchemaUtility"
+        set_schema="zope.app.interfaces.utilities.schema.ISchemaUtility" />
 
   </content>
 
@@ -35,15 +35,10 @@
       set_schema="zope.app.interfaces.services.utility.IUtilityRegistration" />
   </content>
 
-  <adapter
-      factory=".traversal.SchemaFieldTraversable"
-      provides="zope.app.interfaces.traversing.ITraversable"
-      for="zope.app.interfaces.utilities.IMutableSchema" />
-
 
 <!-- Content Component Definition -->
 
-  <content class=".contentcomponent.ContentComponentDefinition">
+  <content class=".content.ContentComponentDefinition">
 
     <factory
       id="utility.ContentComponentDefinition"
@@ -59,13 +54,15 @@
 
     <require
       permission="zope.ManageServices"
-      interface=".definition.IContentComponent"
-      set_schema=".definition.IContentComponent" />
+      interface="
+          zope.app.interfaces.utilities.content.IContentComponentDefinition"
+      set_schema="
+          zope.app.interfaces.utilities.content.IContentComponentDefinition" />
 
   </content>
 
-  
-  <content class=".definition.ContentComponentDefinitionRegistration">
+
+  <content class=".content.ContentComponentDefinitionRegistration">
     <require
       permission="zope.ManageServices"
       interface="zope.app.interfaces.services.utility.IUtilityRegistration
@@ -77,7 +74,7 @@
 
 <!-- Content Component Instance -->
 
-  <content class=".contentcomponent.ContentComponentInstance">
+  <content class=".content.ContentComponentInstance">
     <implements
       interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
   </content>


=== Zope3/src/zope/app/utilities/content.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/utilities/content.py:1.1.2.1	Fri Aug 15 10:04:56 2003
+++ Zope3/src/zope/app/utilities/content.py	Fri Aug 15 13:11:41 2003
@@ -20,7 +20,7 @@
 from persistence import Persistent
 from persistence.dict import PersistentDict
 from zope.app import zapi
-from zope.app.interfaces.container import IAdding 
+from zope.app.interfaces.container import IAdding
 from zope.app.interfaces.utilities.content import \
      IContentComponentDefinition, IContentComponentInstance
 from zope.app.services.menu import LocalBrowserMenuItem
@@ -47,7 +47,7 @@
 
     menuitem_id = None
     menu = None
-    
+
     def activated(self):
         """Once activated, we have to register the new Content Object with the
         appropriate menu.
@@ -66,18 +66,18 @@
         component = self.getComponent()
         component.name = self.name
     activated = ContextMethod(activated)
-        
+
     def deactivated(self):
         """Once activated, we have to unregister the new Content Object with
         the appropriate menu."""
         self.menu.__delitem__(self.menuitem_id)
         self.menu = None
-        self.menuitem_id = None 
+        self.menuitem_id = None
         component = self.getComponent()
         component.name = '<component not activated>'
     deactivated = ContextMethod(deactivated)
 
-    
+
 class ContentComponentInstance(Persistent):
 
     implements(IContentComponentInstance)


=== Zope3/src/zope/app/utilities/instance.py 1.1.2.5 => 1.1.2.6 ===
--- Zope3/src/zope/app/utilities/instance.py:1.1.2.5	Fri Aug 15 10:04:57 2003
+++ Zope3/src/zope/app/utilities/instance.py	Fri Aug 15 13:11:41 2003
@@ -39,7 +39,7 @@
         description=u"Specifies the schema that characterizes the document.",
         required=True)
 
-    
+
 class ContentComponentInstance(Persistent):
 
     implements(IContentComponentInstance)


=== Zope3/src/zope/app/utilities/mutableschemafield.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/utilities/mutableschemafield.py:1.1.2.2	Wed Aug 13 09:20:44 2003
+++ Zope3/src/zope/app/utilities/mutableschemafield.py	Fri Aug 15 13:11:41 2003
@@ -21,10 +21,9 @@
 from zope.interface.interfaces import IInterface
 from zope.interface import providedBy
 from zope.schema.interfaces import ValidationError
-from zope.app.interfaces.utilities import IMutableSchemaField, \
-     IMutableSchemasField
+from zope.app.interfaces.utilities.schema import IMutableSchemaField, \
+     IMutableSchemasField, IMutableSchema
 from zope.app.component.interfacefield import InterfaceField, InterfacesField
-from zope.app.interfaces.utilities import IMutableSchema
 
 class MutableSchemaField(InterfaceField):
 


=== Zope3/src/zope/app/utilities/schema.py 1.1.2.16 => 1.1.2.17 ===
--- Zope3/src/zope/app/utilities/schema.py:1.1.2.16	Fri Aug 15 10:04:57 2003
+++ Zope3/src/zope/app/utilities/schema.py	Fri Aug 15 13:11:41 2003
@@ -20,8 +20,9 @@
 from zope.app.introspector import nameToInterface, interfaceToName
 from zope.app.browser.container.adding import Adding
 from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.utilities.interfaces import IMutableSchemaContent
 from zope.app.interfaces.utilities.schema import \
-     ISchemaAdding, IMutableSchema, ISchemaUtility, IMutableSchemaContent
+     ISchemaAdding, IMutableSchema, ISchemaUtility
 from zope.app.services.interface import PersistentInterfaceClass
 from zope.app.services.interface import PersistentInterface
 from zope.app.services.utility import UtilityRegistration