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

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser/services
In directory cvs.zope.org:/tmp/cvs-serv21522/src/zope/app/browser/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 from the service add menu.


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

<!-- Authentication Service  -->

  <!-- XXX This is silly -->
  <menu id="add_user" 
      title="Menu for adding new User." />

  <page
     name="index.html" 
     for="zope.app.services.auth.IAuthenticationService"
     permission="zope.ManageServices" 
     class="zope.app.browser.container.contents.Contents"
     attribute="contents"
     />

  <view
      name="+"  
      menu="zmi_actions" title="Add"
      for="zope.app.services.auth.IAuthenticationService"
      permission="zope.ManageContent"
      class="zope.app.browser.services.auth.AddUser" >

    <page name="index.html"  template="adduser.pt" />
    <page name="action.html" attribute="action" />

    </view>

  <menuItems
      menu="zmi_views"
      for="zope.app.services.auth.IAuthenticationService">
      <menuItem title="Contents" action="@@index.html"/>
  </menuItems>

  <defaultView for="zope.app.interfaces.security.IPrincipal"
                       name="editForm.html" />

  <pages
      for="zope.app.interfaces.security.IPrincipal"
      permission="zope.View"
      class="zope.app.browser.services.auth.EditUser">

    <page name="editForm.html" template="edituser.pt" />
    <page name="edit.html" attribute="action" />

  </pages>

  <menuItems menu="zmi_views"
        for="zope.app.interfaces.security.IPrincipal">
    <menuItem title="Edit" action="editForm.html"/>
  </menuItems>

</zopeConfigure>


=== Zope3/src/zope/app/browser/services/configure.zcml 1.56 => 1.57 ===
--- Zope3/src/zope/app/browser/services/configure.zcml:1.56	Mon Jun 23 18:46:13 2003
+++ Zope3/src/zope/app/browser/services/configure.zcml	Thu Jun 26 10:51:03 2003
@@ -115,67 +115,8 @@
     <menuItem title="Contents" action="@@index.html"/>
     </menuItems>
 
-<!-- Authentication Service  -->
-
-  <!-- XXX This is silly -->
-  <menu id="add_user" 
-      title="Menu for adding new User." />
-
-  <page
-     name="index.html" 
-     for="zope.app.services.auth.IAuthenticationService"
-     permission="zope.ManageServices" 
-     class="zope.app.browser.container.contents.Contents"
-     attribute="contents"
-     />
-
-  <view
-      name="+"  
-      menu="zmi_actions" title="Add"
-      for="zope.app.services.auth.IAuthenticationService"
-      permission="zope.ManageContent"
-      class="zope.app.browser.services.auth.AddUser" >
-
-    <page name="index.html"  template="adduser.pt" />
-    <page name="action.html" attribute="action" />
-
-    </view>
-
-  <menuItems
-      menu="zmi_views"
-      for="zope.app.services.auth.IAuthenticationService">
-      <menuItem title="Contents" action="@@index.html"/>
-  </menuItems>
-
-  <menuItem
-       menu="add_service"
-       for="zope.app.interfaces.container.IAdding"
-       action="AuthenticationService"
-       title="Simple Authentication Service"
-       description="A Persistent Authentication Service"
-       />
-
-  <defaultView for="zope.app.interfaces.security.IPrincipal"
-                       name="editForm.html" />
-
-  <pages
-      for="zope.app.interfaces.security.IPrincipal"
-      permission="zope.View"
-      class="zope.app.browser.services.auth.EditUser">
-
-    <page name="editForm.html" template="edituser.pt" />
-    <page name="edit.html" attribute="action" />
-
-  </pages>
-
-  <menuItems menu="zmi_views"
-        for="zope.app.interfaces.security.IPrincipal">
-    <menuItem title="Edit" action="editForm.html"/>
-  </menuItems>
-
-<!-- Pluggable Authentication Service -->
-
-<include package=".pluggableauth" />
+<!-- Deprecated Simple Authentication Service --> <include file="auth.zcml" />
+<!-- Pluggable Authentication Service --> <include package=".pluggableauth" />
 
 <!-- Component Location widget -->