[Zope3-checkins] CVS: Zope3/src/zope/app/services - module.zcml:1.2 configure.zcml:1.45

[Jim Fulton]

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

Modified Files:
	configure.zcml 
Added Files:
	module.zcml 
Log Message:
Moved module manager config into separate zcml file.
Updated security assertions to reflect new interface.


=== Zope3/src/zope/app/services/module.zcml 1.1 => 1.2 ===
--- /dev/null	Mon Jun 30 12:24:59 2003
+++ Zope3/src/zope/app/services/module.zcml	Mon Jun 30 12:24:58 2003
@@ -0,0 +1,34 @@
+<zopeConfigure
+    xmlns='http://namespaces.zope.org/zope'
+    xmlns:event='http://namespaces.zope.org/event'
+    xmlns:fssync='http://namespaces.zope.org/fssync'
+    >
+
+<content class="zope.app.services.module.Manager">
+    <require
+        permission="zope.ManageCode"
+        interface="zope.app.interfaces.services.module.IModuleManager"
+        set_schema="zope.app.interfaces.services.module.IModuleManager"
+        />
+</content>
+
+<fssync:adapter
+    class=".module.Manager"
+    factory=".module.ModuleAdapter"
+    />
+
+<adapter 
+    for="zope.app.interfaces.services.folder.ISiteManagementFolder"
+    provides="zope.app.interfaces.file.IFileFactory"
+    name=".py"
+    factory=".module.ModuleFactory"
+    permission="zope.ManageContent"
+    />
+
+<!-- Enable import of persistent modules -->
+<event:subscribe
+  subscriber=".module.installPersistentModuleImporter"
+  event_types="zope.app.interfaces.event.IProcessStartingEvent"
+  />
+
+</zopeConfigure>


=== Zope3/src/zope/app/services/configure.zcml 1.44 => 1.45 ===
--- Zope3/src/zope/app/services/configure.zcml:1.44	Thu Jun 26 15:11:49 2003
+++ Zope3/src/zope/app/services/configure.zcml	Mon Jun 30 12:24:58 2003
@@ -295,22 +295,6 @@
         />
     </content>
 
-<!-- Modules -->
-
-  <content class="zope.app.services.module.Manager">
-    <require
-        permission="zope.ManageCode"
-        interface="zodb.code.interfaces.IPersistentModuleManager"
-        />
-    <require
-        permission="zope.ManageCode"
-        attributes="beforeDeleteHook"
-        />
-    <implements
-        interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
-        />
-  </content>
-
 <!-- Page Folder -->
 
   <content class="zope.app.services.pagefolder.PageFolder">
@@ -498,11 +482,6 @@
     />
 
 <fssync:adapter
-    class=".module.Manager"
-    factory=".module.ModuleAdapter"
-    />
-
-<fssync:adapter
     class=".cache.CacheRegistration"
     factory=".registration.ComponentRegistrationAdapter"
     />
@@ -536,21 +515,10 @@
   permission="zope.ManageContent"
   />
 
-<adapter 
-  for="zope.app.interfaces.services.folder.ISiteManagementFolder"
-  provides="zope.app.interfaces.file.IFileFactory"
-  name=".py"
-  factory=".module.ModuleFactory"
-  permission="zope.ManageContent"
-  />
-
 <!-- Local Interface Service -->
 <include file="interface.zcml" />
 
-<!-- Enable import of persistent modules -->
-<event:subscribe
-  subscriber=".module.installPersistentModuleImporter"
-  event_types="zope.app.interfaces.event.IProcessStartingEvent"
-  />
+<!-- Local Module Support -->
+<include file="module.zcml" />
 
 </zopeConfigure>