[Zope3-checkins] CVS: Zope3/src/zope/app/services - auth.zcml:1.1 configure.zcml:1.43

[Jim Fulton]

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

Modified Files:
	configure.zcml 
Added Files:
	auth.zcml 
Log Message:
Moved the simple auth service config into into it's own file
and removed the (deprecated) service factory definition.


=== Added File Zope3/src/zope/app/services/auth.zcml ===
<zopeConfigure
    xmlns='http://namespaces.zope.org/zope'
    xmlns:fssync='http://namespaces.zope.org/fssync'
    >

<!-- Note that the simmple auth ios only being kept around
     for some backward comptability. We will eventually remove it.

     XXX We really need to conversion scheme.
  -->

  <content class="zope.app.services.auth.AuthenticationService">

    <require
        permission="zope.View"
        interface="zope.app.interfaces.security.IAuthenticationService" />
    <require
        permission="zope.View"
        attributes="getAllUsers" />

    <require
        permission="zope.ManageServices"
        interface="zope.app.interfaces.container.IContainer" />

    </content>

  <content class="zope.app.services.auth.User">
    <factory id="User" permission="zope.ManageServices" />
      <require
          permission="zope.View"
          interface="zope.app.interfaces.services.auth.IReadUser" />
      <require
          permission="zope.ManageContent"
          interface="zope.app.interfaces.services.auth.IWriteUser" />
      <implements
          interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
    </content>

</zopeConfigure>


=== Zope3/src/zope/app/services/configure.zcml 1.42 => 1.43 ===
--- Zope3/src/zope/app/services/configure.zcml:1.42	Tue Jun 24 11:38:04 2003
+++ Zope3/src/zope/app/services/configure.zcml	Thu Jun 26 10:51:34 2003
@@ -437,42 +437,8 @@
                     unsubscribedFrom subscribedTo" />
     </content>
 
-<!-- Authentication Service -->
-
-  <content class="zope.app.services.auth.AuthenticationService">
-
-    <factory id="AuthenticationService" permission="zope.ManageServices" />
-
-    <!-- XXX Should you *really* be able to get all this with just the
-         view permission? -->
-    <require
-        permission="zope.View"
-        interface="zope.app.interfaces.security.IAuthenticationService" />
-    <require
-        permission="zope.View"
-        attributes="getAllUsers" />
-
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.interfaces.container.IContainer" />
-
-    </content>
-
-  <content class="zope.app.services.auth.User">
-    <factory id="User" permission="zope.ManageServices" />
-      <require
-          permission="zope.View"
-          interface="zope.app.interfaces.services.auth.IReadUser" />
-      <require
-          permission="zope.ManageContent"
-          interface="zope.app.interfaces.services.auth.IWriteUser" />
-      <implements
-          interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-    </content>
-
-<!-- Pluggable Authentication Service -->
-
-<include package=".pluggableauth" />
+<!-- Old simple auth service --> <include file="auth.zcml" />
+<!-- Pluggable Authentication Service --> <include package=".pluggableauth" />
 
 <!-- Event Service -->
 <content class='zope.app.services.event.EventService'>