[Zope-Checkins] CVS: Zope3/lib/python/Zope - meta.zcml:1.1.2.1.2.1 zope.zcml:1.1.2.2.2.1

[Stephan Richter]

Update of /cvs-repository/Zope3/lib/python/Zope
In directory cvs.zope.org:/tmp/cvs-serv32648/lib/python/Zope

Modified Files:
      Tag: srichter-OFS_Formulator-branch
	meta.zcml zope.zcml 
Log Message:
- Simple setup (ZCML) changes of files.

- Various other little things


=== Zope3/lib/python/Zope/meta.zcml 1.1.2.1 => 1.1.2.1.2.1 ===
 <!-- Standard configuration directives -->
 
-  <!-- Zope.App.ZMI -->
-  <directives namespace="http://namespaces.zope.org/zmi">
-    <directive name="provideClass"
-               attributes="name, permission_id, title, description"
-               handler="Zope.App.ZMI.provideClass.ContentClassDir" />
-    <directive name="tabs" attributes="for"
-               handler="Zope.App.ZMI.TabsDirective.">
-        <subdirective name="tab" attributes="label, action, label" />
-    </directive>
-    <directive name="icon" attributes="for, file, package, alt"
-               handler="Zope.App.ZMI.IconDirective." />
-  </directives>
-
   <!-- Zope.App.ZMI.Service -->
   <directives namespace="http://namespaces.zope.org/service">
    	 <directive name="provideClass"
@@ -28,67 +15,9 @@
 
   </directives>
 
+<include package="Zope.ComponentArchitecture" file="component-meta.zcml" />
+<include package="Zope.App" file="app-meta.zcml" />
+<include package="Zope.Publisher" file="publisher-meta.zcml" />
 
-  <!-- Zope.App.Security -->
-  <directives namespace="http://namespaces.zope.org/security">
-    <directive name="permission"
-               attributes="permission_id, title, description"
-               handler="Zope.App.Security.metaConfigure.definePermission" />
-    <directive name="role"
-               attributes="role_id, title, description"
-               handler="Zope.App.Security.metaConfigure.defineRole" />
-    <directive name="protectClass"
-               attributes="name, permission_id, interface, method, methods"
-       handler="Zope.App.Security.protectClass.">
-      <subdirective name="protect"
-                    attributes="permission_id, interface, method, methods" />
-      <subdirective name="instances" attributes="permission_id" />
-      </directive>
-    <directive name="publicClass" attributes="name, interface, method, methods"
-               handler="Zope.App.Security.publicClass." />
-    <directive name="defaultPolicy" attributes="name"
-       handler="Zope.App.Security.metaConfigure.defaultPolicy" />
-    <directive name="principal" attributes="principal_id, title, description"
-       handler="Zope.App.Security.metaConfigure.principal" />
-    <directive name="defaultPrincipal" 
-               attributes="principal_id, title, description"
-       handler="Zope.App.Security.metaConfigure.defaultPrincipal" />
-    <directive name="grantPermissionToRole" attributes="permission_id, role_id"
-       handler="Zope.App.Security.metaConfigure.grantPermissionToRole" />
-    <directive
-       name="grantPermissionToPrincipal"
-       attributes="permission_id, principal_id"
-       handler="Zope.App.Security.metaConfigure.grantPermissionToPrincipal" />
-    <directive name="assignRoleToPrincipal" attributes="role_id, principal_id"
-       handler="Zope.App.Security.metaConfigure.assignRoleToPrincipal" />
-  </directives>
-
-  <!-- Zope.ComponentArchitecture -->
-  <directives namespace="http://namespaces.zope.org/zope">
-    <directive name="adapter" attributes="component, provides, for"
-       handler="Zope.ComponentArchitecture.metaConfigure.adapter" />
-    <directive name="utility" attributes="component, provides"
-       handler="Zope.ComponentArchitecture.metaConfigure.utility" />
-    <directive name="view" attributes="component, type, name, for, layer"
-       handler="Zope.ComponentArchitecture.metaConfigure.view" />
-    <directive name="defaultView" attributes="component, type, name, for, layer"
-       handler="Zope.ComponentArchitecture.metaConfigure.defaultView" />
-    <directive name="skin" attributes="name, type, layers" 
-        handler="Zope.ComponentArchitecture.metaConfigure.skin" />
-    <directive name="serviceType" attributes="name, interface"
-       handler="Zope.ComponentArchitecture.metaConfigure.serviceType" />
-    <directive name="service" attributes="name, component"
-       handler="Zope.ComponentArchitecture.metaConfigure.service" />
-  </directives>
   
-  <!-- Zope.Publisher.Browser -->
-  <directives namespace="http://namespaces.zope.org/browser">
-    <directive name="view" attributes="component, name, for"
-       handler="Zope.Publisher.Browser.metaConfigure.view" />
-    <directive name="defaultView" attributes="component, name, for"
-       handler="Zope.Publisher.Browser.metaConfigure.defaultView" />
-    <directive name="skin" attributes="name, layers" 
-        handler="Zope.Publisher.Browser.metaConfigure.skin" />
-  </directives>
-
 </zopeConfigure>


=== Zope3/lib/python/Zope/zope.zcml 1.1.2.2 => 1.1.2.2.2.1 ===
 <include package="Zope.App" file="app-meta.zcml" />
 <include package="Zope.ComponentArchitecture" file="component-meta.zcml" />
-<include package="Zope.Publisher.Browser" file="browser-meta.zcml" />
+<include package="Zope.Publisher" file="publisher-meta.zcml" />
 
 
 <!-- Standard Permissions -->