[Zope3-checkins] SVN: Zope3/branches/srichter-blow-services/src/zope/app/ Fixed last broken functional tests.

Stephan Richter srichter at cosmos.phy.tufts.edu
Thu Jan 13 10:51:50 EST 2005 

Log message for revision 28823:
  Fixed last broken functional tests.
  

Changed:
  U   Zope3/branches/srichter-blow-services/src/zope/app/apidoc/ifacemodule/menu.pt
  U   Zope3/branches/srichter-blow-services/src/zope/app/apidoc/utilitymodule/__init__.py
  U   Zope3/branches/srichter-blow-services/src/zope/app/catalog/browser/README.txt
  U   Zope3/branches/srichter-blow-services/src/zope/app/component/browser/site_management.pt
  U   Zope3/branches/srichter-blow-services/src/zope/app/demo/pageletchooser/configure.zcml
  U   Zope3/branches/srichter-blow-services/src/zope/app/ftests/doctest.txt
  U   Zope3/branches/srichter-blow-services/src/zope/app/generations/browser/ftests.py
  U   Zope3/branches/srichter-blow-services/src/zope/app/i18n/browser/synchronize.pt
  U   Zope3/branches/srichter-blow-services/src/zope/app/i18n/browser/translatemessage.pt
  U   Zope3/branches/srichter-blow-services/src/zope/app/intid/browser/tracking.txt
  U   Zope3/branches/srichter-blow-services/src/zope/app/introspector/introspector.pt
  U   Zope3/branches/srichter-blow-services/src/zope/app/introspector/marker.pt
  U   Zope3/branches/srichter-blow-services/src/zope/app/onlinehelp/browser/__init__.py
  U   Zope3/branches/srichter-blow-services/src/zope/app/pageletchooser/configure.zcml
  U   Zope3/branches/srichter-blow-services/src/zope/app/pau/browser/groupfolder.txt
  U   Zope3/branches/srichter-blow-services/src/zope/app/pau/browser/principalfolder.txt
  U   Zope3/branches/srichter-blow-services/src/zope/app/zopetop/widget_macros.pt

-=-
Modified: Zope3/branches/srichter-blow-services/src/zope/app/apidoc/ifacemodule/menu.pt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/apidoc/ifacemodule/menu.pt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/apidoc/ifacemodule/menu.pt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -2,8 +2,7 @@
 <body>
 
   <p metal:fill-slot="post_menu" class="small" i18n:translate="">
-    Note: These are only interfaces that are registered with the Interface
-    Service. 
+    Note: These are only interfaces that are registered with the site manager. 
   </p>
 
 </body>

Modified: Zope3/branches/srichter-blow-services/src/zope/app/apidoc/utilitymodule/__init__.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/apidoc/utilitymodule/__init__.py	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/apidoc/utilitymodule/__init__.py	2005-01-13 15:51:50 UTC (rev 28823)
@@ -83,14 +83,13 @@
 
     def get(self, key, default=None):
         """See zope.app.container.interfaces.IReadContainer"""
-        sm = zapi.getSiteManager()
+        sm = zapi.getGlobalSiteManager()
         if key == NONAME:
             key = ''
         utils = [Utility(self, reg)
                  for reg in sm.registrations()
-                 if isinstance(reg, UtilityRegistration) and \
+                 if zapi.isinstance(reg, UtilityRegistration) and \
                      reg.name == key and reg.provided == self.interface]
-
         return utils and utils[0] or default
 
     def items(self):

Modified: Zope3/branches/srichter-blow-services/src/zope/app/catalog/browser/README.txt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/catalog/browser/README.txt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/catalog/browser/README.txt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -30,38 +30,48 @@
 
   >>> print http(r"""
   ... POST /++etc++site/default/IntIds/addRegistration.html HTTP/1.1
-  ... Authorization: Basic bWdyOm1ncnB3
-  ... Content-Length: 864
-  ... Content-Type: multipart/form-data; boundary=---------------------------68417209514430962931254091825
-  ... Referer: http://localhost:8081/++etc++site/default/IntIds/addRegistration.html
+  ... Authorization: Basic mgr:mgrpw
+  ... Referer: http://localhost:8081/++etc++site/default/IntIds/
+  ... Content-Type: multipart/form-data; boundary=----------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
   ... 
-  ... -----------------------------68417209514430962931254091825
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
   ... Content-Disposition: form-data; name="field.name"
   ... 
   ... 
-  ... -----------------------------68417209514430962931254091825
-  ... Content-Disposition: form-data; name="field.interface"
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.provided"
   ... 
   ... zope.app.intid.interfaces.IIntIds
-  ... -----------------------------68417209514430962931254091825
-  ... Content-Disposition: form-data; name="field.interface-empty-marker"
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.provided-empty-marker"
   ... 
   ... 1
-  ... -----------------------------68417209514430962931254091825
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.status"
+  ... 
+  ... Active
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.status-empty-marker"
+  ... 
+  ... 1
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
   ... Content-Disposition: form-data; name="field.permission"
   ... 
-  ... zope.Public
-  ... -----------------------------68417209514430962931254091825
+  ... 
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
   ... Content-Disposition: form-data; name="field.permission-empty-marker"
   ... 
   ... 1
-  ... -----------------------------68417209514430962931254091825
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
   ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
   ... 
   ... Add
-  ... -----------------------------68417209514430962931254091825--
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ--
   ... """)
-  HTTP/1.1 303 ...
+  HTTP/1.1 303 See Other
+  ...
+  Location: @@SelectedManagementView.html
+  ...
 
 
 Moving short-id management outside of catalogs make it possible to
@@ -94,39 +104,45 @@
 
 and register it:
 
-
   >>> print http(r"""
   ... POST /++etc++site/default/Catalog/addRegistration.html HTTP/1.1
   ... Authorization: Basic bWdyOm1ncnB3
-  ... Content-Length: 855
-  ... Content-Type: multipart/form-data; boundary=---------------------------17974048709381505781405189947
-  ... Referer: http://localhost:8081/++etc++site/default/Catalog/addRegistration.html
+  ... Referer: http://localhost:8081/++etc++site/default/Catalog/
+  ... Content-Type: multipart/form-data; boundary=----------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
   ... 
-  ... -----------------------------17974048709381505781405189947
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
   ... Content-Disposition: form-data; name="field.name"
   ... 
   ... 
-  ... -----------------------------17974048709381505781405189947
-  ... Content-Disposition: form-data; name="field.interface"
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
+  ... Content-Disposition: form-data; name="field.provided"
   ... 
   ... zope.app.catalog.interfaces.ICatalog
-  ... -----------------------------17974048709381505781405189947
-  ... Content-Disposition: form-data; name="field.interface-empty-marker"
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
+  ... Content-Disposition: form-data; name="field.provided-empty-marker"
   ... 
   ... 1
-  ... -----------------------------17974048709381505781405189947
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
+  ... Content-Disposition: form-data; name="field.status"
+  ... 
+  ... Active
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
+  ... Content-Disposition: form-data; name="field.status-empty-marker"
+  ... 
+  ... 1
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
   ... Content-Disposition: form-data; name="field.permission"
   ... 
   ... zope.Public
-  ... -----------------------------17974048709381505781405189947
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
   ... Content-Disposition: form-data; name="field.permission-empty-marker"
   ... 
   ... 1
-  ... -----------------------------17974048709381505781405189947
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa
   ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
   ... 
   ... Add
-  ... -----------------------------17974048709381505781405189947--
+  ... ------------61t9UJyoacebBevQVdNrlvXP6T9Ik3Xo4RyXkwJJWvuhao65RTuAPRa--
   ... """)
   HTTP/1.1 303 ...
 

Modified: Zope3/branches/srichter-blow-services/src/zope/app/component/browser/site_management.pt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/component/browser/site_management.pt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/component/browser/site_management.pt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -86,17 +86,18 @@
         <i>No instances of this utility are available yet.</i>
       </div>
     </div>
-    <div tal:condition="tool/add"
-         tal:define="info view/addingInfo">
-      <input type="text" width="20" name="id" value="">
-      <select name="type_name">
-        <option tal:repeat="entry info"
-                tal:attributes="value entry/action"
-                tal:content="entry/title">RAM Cache</option>
-      </select>
-      &nbsp;
-      <input type="submit" name="ADD-TOOL-SUBMIT" value="Add">
-      <input type="submit" name="CANCEL-ADD-TOOL-SUBMIT" value="Cancel">
+    <div tal:condition="tool/add">
+      <div tal:define="info view/addingInfo">
+        <input type="text" width="20" name="id" value="">
+        <select name="type_name">
+          <option tal:repeat="entry info"
+                  tal:attributes="value entry/action"
+                  tal:content="entry/title">RAM Cache</option>
+        </select>
+        &nbsp;
+        <input type="submit" name="ADD-TOOL-SUBMIT" value="Add">
+        <input type="submit" name="CANCEL-ADD-TOOL-SUBMIT" value="Cancel">
+      </div>
     </div>
     <br/>
     <div>

Modified: Zope3/branches/srichter-blow-services/src/zope/app/demo/pageletchooser/configure.zcml
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/demo/pageletchooser/configure.zcml	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/demo/pageletchooser/configure.zcml	2005-01-13 15:51:50 UTC (rev 28823)
@@ -66,7 +66,7 @@
       name="firstlevelmacronames"
       factory="zope.app.pageletchooser.vocabulary.PageletNamesVocabulary"
       layer="zope.publisher.interfaces.browser.IBrowserRequest"
-      view="zope.component.interfaces.IView"
+      view="zope.component.bbb.interfaces.IView"
       slot="zope.app.demo.pageletchooser.interfaces.IFirstLevelPagelets"
       />
 

Modified: Zope3/branches/srichter-blow-services/src/zope/app/ftests/doctest.txt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/ftests/doctest.txt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/ftests/doctest.txt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -63,7 +63,7 @@
   HTTP/1.1 303 See Other
   Content-Length: 0
   Content-Type: text/plain;charset=utf-8
-  Location: @@tasks.html
+  Location: @@contents.html
   <BLANKLINE>
 
 Note that, in this case, we got a 303 response.  A 303 response is the
@@ -78,13 +78,13 @@
   HTTP/1.0 302 Moved Temporarily
   Content-Length: 0
   Content-Type: text/plain;charset=utf-8
-  Location: @@tasks.html
+  Location: @@contents.html
   <BLANKLINE>
 
-Lets visit the page we were rediected to:
+Lets visit the page we were redirected to:
 
   >>> print http(r"""
-  ... GET /++etc++site/@@tasks.html HTTP/1.1
+  ... GET /++etc++site/@@contents.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Referer: http://localhost:8081/
   ... """)

Modified: Zope3/branches/srichter-blow-services/src/zope/app/generations/browser/ftests.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/generations/browser/ftests.py	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/generations/browser/ftests.py	2005-01-13 15:51:50 UTC (rev 28823)
@@ -24,7 +24,7 @@
 class TestDatabaseSchema(functional.BrowserTestCase):
 
     def test(self):
-        BrowserTestCase.setUp(self)
+        functional.BrowserTestCase.setUp(self)
         
         root = self.getRootFolder()._p_jar.root()
         appkey = 'zope.app.generations.demo'

Modified: Zope3/branches/srichter-blow-services/src/zope/app/i18n/browser/synchronize.pt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/i18n/browser/synchronize.pt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/i18n/browser/synchronize.pt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -1,7 +1,7 @@
 <html metal:use-macro="context/@@standard_macros/view">
 <head>
   <title metal:fill-slot="title" i18n:translate="">
-    Translation Service - Synchronize
+    Translation Domain - Synchronize
   </title>
 
   <style metal:fill-slot="style_slot" type="text/css">

Modified: Zope3/branches/srichter-blow-services/src/zope/app/i18n/browser/translatemessage.pt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/i18n/browser/translatemessage.pt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/i18n/browser/translatemessage.pt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -1,7 +1,7 @@
 <html metal:use-macro="context/@@standard_macros/page">
 <head>
   <title metal:fill-slot="title" i18n:translate="">
-    Translation Service - Translate
+    Translation Domain - Translate
   </title>
 </head>
 

Modified: Zope3/branches/srichter-blow-services/src/zope/app/intid/browser/tracking.txt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/intid/browser/tracking.txt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/intid/browser/tracking.txt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -4,29 +4,60 @@
 Unique ID utilities track object add moves.  Let's look at an
 example. First, we'll create a unique Id utility:
 
-  (The first request is a bit weird.  It is part of the current
-   tools UI.  It arranges for a tools site-management folder to be
-   created.  We really need to rethink how we manage TTW utilities.)
-
   >>> print http(r"""
-  ... GET /++etc++site/AddIIntIdsTool HTTP/1.1
+  ... POST /++etc++site/default/@@contents.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
-  ... Referer: http://localhost:8081/++etc++site/@@manageIIntIdsTool.html
-  ... """)
-  HTTP/1.1 200 Ok
+  ... Referer: http://localhost:8081/++etc++site/default/@@contents.html
   ...
+  ... type_name=BrowserAdd__zope.app.intid.IntIds&new_value=""")
+  HTTP/1.1 303 See Other
+  ...
+  Location: http://localhost/++etc++site/default/IntIds/@@registration.html
+  ...
 
   >>> print http(r"""
-  ... POST /++etc++site/AddIIntIdsTool/action.html HTTP/1.1
+  ... POST /++etc++site/default/IntIds/addRegistration.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
-  ... Content-Length: 69
-  ... Content-Type: application/x-www-form-urlencoded
-  ... Referer: http://localhost:8081/++etc++site/AddIIntIdsTool
+  ... Referer: http://localhost:8081/++etc++site/default/IntIds/
+  ... Content-Type: multipart/form-data; boundary=----------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
   ... 
-  ... type_name=BrowserAdd__zope.app.intid.IntIds&id=&add=+Add+""")
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.name"
+  ... 
+  ... IntIds
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.provided"
+  ... 
+  ... zope.app.intid.interfaces.IIntIds
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.provided-empty-marker"
+  ... 
+  ... 1
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.status"
+  ... 
+  ... Active
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.status-empty-marker"
+  ... 
+  ... 1
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.permission"
+  ... 
+  ... 
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="field.permission-empty-marker"
+  ... 
+  ... 1
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ
+  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
+  ... 
+  ... Add
+  ... ------------CedQTrEQIEPbgfYhvcITAhQi2aJdgu3tYfJ0WYQmkpLQTt6OTOpd5GJ--
+  ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: ../@@manageIIntIdsTool.html
+  Location: @@SelectedManagementView.html
   ...
 
 Now, we'll add a few folders:
@@ -75,9 +106,9 @@
 the objects we added:
 
   >>> print http(r"""
-  ... GET /++etc++site/tools/IntIds/@@index.html HTTP/1.1
+  ... GET /++etc++site/default/IntIds/@@index.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
-  ... Referer: http://localhost:8081/++etc++site/tools/@@contents.html
+  ... Referer: http://localhost:8081/++etc++site/default/@@contents.html
   ... """)
   HTTP/1.1 200 Ok
   ...4 objects...
@@ -102,9 +133,9 @@
 We'll see that reflected in the utility:
 
   >>> print http(r"""
-  ... GET /++etc++site/tools/IntIds/@@index.html HTTP/1.1
+  ... GET /++etc++site/default/IntIds/@@index.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
-  ... Referer: http://localhost:8081/++etc++site/tools/@@contents.html
+  ... Referer: http://localhost:8081/++etc++site/default/@@contents.html
   ... """)
   HTTP/1.1 200 Ok
   ...4 objects...
@@ -129,9 +160,9 @@
 all of the objects will go away:
 
   >>> print http(r"""
-  ... GET /++etc++site/tools/IntIds/@@index.html HTTP/1.1
+  ... GET /++etc++site/default/IntIds/@@index.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
-  ... Referer: http://localhost:8081/++etc++site/tools/@@contents.html
+  ... Referer: http://localhost:8081/++etc++site/default/@@contents.html
   ... """)
   HTTP/1.1 200 Ok
   ...0 objects...

Modified: Zope3/branches/srichter-blow-services/src/zope/app/introspector/introspector.pt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/introspector/introspector.pt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/introspector/introspector.pt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -16,8 +16,7 @@
 <body>
 <div metal:fill-slot="body">
   <tal:block
-      tal:define="global introspector view/getIntrospector;
-                  global services view/getServicesFor">
+      tal:define="global introspector view/getIntrospector">
 
     <div tal:condition="python:introspector.isInterface()">
 
@@ -97,20 +96,6 @@
           </td>
         </tr>
 
-        <!-- this section is currently not available
-        <tr>
-          <th class="introspector">
-            <tal:span i18n:translate="">Services</tal:span>:
-          </th>
-          <td>
-            <div tal:repeat="servicedic services">
-              <span tal:define="dic repeat/servicedic/item">
-                <a tal:content="python:dic.keys()[0]"/>
-              </span>
-            </div>
-          </td>
-        </tr>
-        -->
       </table>
     </div>
 

Modified: Zope3/branches/srichter-blow-services/src/zope/app/introspector/marker.pt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/introspector/marker.pt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/introspector/marker.pt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -17,7 +17,6 @@
 <div metal:fill-slot="body">
   <tal:block
       tal:define ="global introspector view/getIntrospector;
-                   global services view/getServicesFor;
                    global status view/update">
 
   <form action="" tal:attributes="action request/URL" method="POST">

Modified: Zope3/branches/srichter-blow-services/src/zope/app/onlinehelp/browser/__init__.py
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/onlinehelp/browser/__init__.py	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/onlinehelp/browser/__init__.py	2005-01-13 15:51:50 UTC (rev 28823)
@@ -76,7 +76,7 @@
         source = zapi.createObject(None,
                                    self.context.type,
                                    self.context.source)
-        view = zapi.getMutliAdapter((source, self.request))
+        view = zapi.getMultiAdapter((source, self.request))
         html = view.render()
         return html
 

Modified: Zope3/branches/srichter-blow-services/src/zope/app/pageletchooser/configure.zcml
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/pageletchooser/configure.zcml	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/pageletchooser/configure.zcml	2005-01-13 15:51:50 UTC (rev 28823)
@@ -35,7 +35,7 @@
       name="chooseablepageletnames"
       factory=".vocabulary.PageletNamesVocabulary"
       layer="zope.publisher.interfaces.browser.IBrowserRequest"
-      view="zope.component.interfaces.IView"
+      view="zope.component.bbb.interfaces.IView"
       slot="zope.app.pageletchooser.interfaces.IChooseablePagelets"
       />
 

Modified: Zope3/branches/srichter-blow-services/src/zope/app/pau/browser/groupfolder.txt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/pau/browser/groupfolder.txt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/pau/browser/groupfolder.txt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -15,48 +15,80 @@
 
 First, we'll create a principal folder:
 
-  (The first request is a bit weird.  It is part of the current
-   tools UI.  It arranges for a tools site-management folder to be
-   created.  We really need to rethink how we manage TTW utilities.)
-
   >>> print http(r"""
-  ... GET /++etc++site/AddISearchableAuthenticationPluginTool HTTP/1.1
+  ... POST /++etc++site/default/+/AddPrincipalFolder.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
-  ... Referer: http://localhost:8081/++etc++site/@@manageISearchableAuthenticationPluginTool.html
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-
-  >>> print http(r"""
-  ... POST /++etc++site/AddISearchableAuthenticationPluginTool/AddPrincipalFolder.html%3D HTTP/1.1
-  ... Authorization: Basic mgr:mgrpw
-  ... Content-Length: 434
-  ... Content-Type: multipart/form-data; boundary=---------------------------190685539214643056941988788830
-  ... Referer: http://localhost:8081/++etc++site/AddISearchableAuthenticationPluginTool/AddPrincipalFolder.html=
+  ... Referer: http://localhost:8081/++etc++site/default/+/
+  ... Content-Type: multipart/form-data; boundary=----------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C
   ... 
-  ... -----------------------------190685539214643056941988788830
+  ... ------------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C
   ... Content-Disposition: form-data; name="field.prefix"
   ... 
   ... users.
-  ... -----------------------------190685539214643056941988788830
+  ... ------------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C
   ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
   ... 
   ... Add
-  ... -----------------------------190685539214643056941988788830
+  ... ------------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C
   ... Content-Disposition: form-data; name="add_input_name"
   ... 
   ... users
-  ... -----------------------------190685539214643056941988788830--
+  ... ------------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C--  
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: ../@@manageISearchableAuthenticationPluginTool.html
+  Location: http://localhost/++etc++site/default/users/@@registration.html
   ...
 
-Next we'l add some users:
+  >>> print http(r"""
+  ... POST /++etc++site/default/users/addRegistration.html HTTP/1.1
+  ... Authorization: Basic mgr:mgrpw
+  ... Referer: http://localhost:8081/++etc++site/default/users/
+  ... Content-Type: multipart/form-data; boundary=----------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... 
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.name"
+  ... 
+  ... users
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.provided"
+  ... 
+  ... zope.app.pau.interfaces.ISearchableAuthenticationPlugin
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.provided-empty-marker"
+  ... 
+  ... 1
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.status"
+  ... 
+  ... Active
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.status-empty-marker"
+  ... 
+  ... 1
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.permission"
+  ... 
+  ... 
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.permission-empty-marker"
+  ... 
+  ... 1
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
+  ... 
+  ... Add
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF--
+  ... """)
+  HTTP/1.1 303 See Other
+  ...
+  Location: @@SelectedManagementView.html
+  ...
 
+Next we'll add some users:
+
   >>> print http(r"""
-  ... POST /++etc++site/tools/users/+/AddPrincipalInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/users/+/AddPrincipalInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 784
   ... Content-Type: multipart/form-data; boundary=---------------------------62010169718836874861388307181
@@ -89,11 +121,11 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/users/@@contents.html
+  Location: http://localhost/++etc++site/default/users/@@contents.html
   ...
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/users/+/AddPrincipalInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/users/+/AddPrincipalInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 779
   ... Content-Type: multipart/form-data; boundary=---------------------------1501629520183211901834390790
@@ -126,11 +158,11 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/users/@@contents.html
+  Location: http://localhost/++etc++site/default/users/@@contents.html
   ...
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/users/+/AddPrincipalInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/users/+/AddPrincipalInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 781
   ... Content-Type: multipart/form-data; boundary=---------------------------3362827831346173768318792608
@@ -163,11 +195,11 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/users/@@contents.html
+  Location: http://localhost/++etc++site/default/users/@@contents.html
   ...
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/users/+/AddPrincipalInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/users/+/AddPrincipalInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 781
   ... Content-Type: multipart/form-data; boundary=---------------------------1771586876978613244952985501
@@ -200,11 +232,11 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/users/@@contents.html
+  Location: http://localhost/++etc++site/default/users/@@contents.html
   ...
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/users/+/AddPrincipalInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/users/+/AddPrincipalInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 783
   ... Content-Type: multipart/form-data; boundary=---------------------------6406512534224572322062554722
@@ -237,11 +269,11 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/users/@@contents.html
+  Location: http://localhost/++etc++site/default/users/@@contents.html
   ...
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/users/+/AddPrincipalInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/users/+/AddPrincipalInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 779
   ... Content-Type: multipart/form-data; boundary=---------------------------1596878616204415667781266350
@@ -274,11 +306,11 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/users/@@contents.html
+  Location: http://localhost/++etc++site/default/users/@@contents.html
   ...
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/users/+/AddPrincipalInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/users/+/AddPrincipalInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 793
   ... Content-Type: multipart/form-data; boundary=---------------------------160587971417390263241080578782
@@ -311,36 +343,81 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/users/@@contents.html
+  Location: http://localhost/++etc++site/default/users/@@contents.html
   ...
 
-Next, we'll add out groups folder:
+Next, we'll add our groups folder:
 
   >>> print http(r"""
-  ... POST /++etc++site/AddIPrincipalSearchPluginTool/AddGroupFolder.html%3D HTTP/1.1
+  ... POST /++etc++site/default/+/AddGroupFolder.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
-  ... Content-Length: 432
-  ... Content-Type: multipart/form-data; boundary=---------------------------18984415031531709165482618952
+  ... Referer: http://localhost:8081/++etc++site/default/+/AddGroupFolder.html=
+  ... Content-Type: multipart/form-data; boundary=----------HR0o47BKrDUFNq9E3ALh84RAhH2NErKTGLHLQRdGe6VzwcDxmYcva23
   ... 
-  ... -----------------------------18984415031531709165482618952
+  ... ------------HR0o47BKrDUFNq9E3ALh84RAhH2NErKTGLHLQRdGe6VzwcDxmYcva23
   ... Content-Disposition: form-data; name="field.prefix"
   ... 
   ... groups.
-  ... -----------------------------18984415031531709165482618952
+  ... ------------HR0o47BKrDUFNq9E3ALh84RAhH2NErKTGLHLQRdGe6VzwcDxmYcva23
   ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
   ... 
   ... Add
-  ... -----------------------------18984415031531709165482618952
+  ... ------------HR0o47BKrDUFNq9E3ALh84RAhH2NErKTGLHLQRdGe6VzwcDxmYcva23
   ... Content-Disposition: form-data; name="add_input_name"
   ... 
   ... groups
-  ... -----------------------------18984415031531709165482618952--
+  ... ------------HR0o47BKrDUFNq9E3ALh84RAhH2NErKTGLHLQRdGe6VzwcDxmYcva23--
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: ../@@manageIPrincipalSearchPluginTool.html
+  Location: http://localhost/++etc++site/default/groups/@@registration.html
   ...
 
+  >>> print http(r"""
+  ... POST /++etc++site/default/groups/addRegistration.html HTTP/1.1
+  ... Authorization: Basic mgr:mgrpw
+  ... Referer: http://localhost:8081/++etc++site/default/groups/
+  ... Content-Type: multipart/form-data; boundary=----------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... 
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... Content-Disposition: form-data; name="field.name"
+  ... 
+  ... groups
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... Content-Disposition: form-data; name="field.provided"
+  ... 
+  ... zope.app.pau.groupfolder.IGroupFolder
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... Content-Disposition: form-data; name="field.provided-empty-marker"
+  ... 
+  ... 1
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... Content-Disposition: form-data; name="field.status"
+  ... 
+  ... Active
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... Content-Disposition: form-data; name="field.status-empty-marker"
+  ... 
+  ... 1
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... Content-Disposition: form-data; name="field.permission"
+  ... 
+  ... 
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... Content-Disposition: form-data; name="field.permission-empty-marker"
+  ... 
+  ... 1
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny
+  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
+  ... 
+  ... Add
+  ... ------------BGTUKtsean7c7LiNseTnrHwOhb3mhCwsSPKkGDPqyUS5p8QgktRb8Ny--
+  ... """)
+  HTTP/1.1 303 See Other
+  ...
+  Location: @@SelectedManagementView.html
+  ...
+
 Now, before we can define any groups, we have to add and register a PAU:
 
   >>> print http(r"""
@@ -357,35 +434,41 @@
   >>> print http(r"""
   ... POST /++etc++site/default/LocalPAU/addRegistration.html HTTP/1.1
   ... Authorization: Basic bWdyOm1ncnB3
-  ... Content-Length: 852
-  ... Content-Type: multipart/form-data; boundary=---------------------------1649392783947785437368129046
-  ... Referer: http://localhost:8081/++etc++site/default/LocalPAU/
+  ... Content-Type: multipart/form-data; boundary=----------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... 
-  ... -----------------------------1649392783947785437368129046
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... Content-Disposition: form-data; name="field.name"
   ... 
   ... 
-  ... -----------------------------1649392783947785437368129046
-  ... Content-Disposition: form-data; name="field.interface"
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
+  ... Content-Disposition: form-data; name="field.provided"
   ... 
   ... zope.app.security.interfaces.IAuthenticationUtility
-  ... -----------------------------1649392783947785437368129046
-  ... Content-Disposition: form-data; name="field.interface-empty-marker"
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
+  ... Content-Disposition: form-data; name="field.provided-empty-marker"
   ... 
   ... 1
-  ... -----------------------------1649392783947785437368129046
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
+  ... Content-Disposition: form-data; name="field.status"
+  ... 
+  ... Active
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
+  ... Content-Disposition: form-data; name="field.status-empty-marker"
+  ... 
+  ... 1
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... Content-Disposition: form-data; name="field.permission"
   ... 
   ... 
-  ... -----------------------------1649392783947785437368129046
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... Content-Disposition: form-data; name="field.permission-empty-marker"
   ... 
   ... 1
-  ... -----------------------------1649392783947785437368129046
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
   ... 
   ... Add
-  ... -----------------------------1649392783947785437368129046--
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq--
   ... """)
   HTTP/1.1 303 See Other
   ...
@@ -469,7 +552,7 @@
 "Admin":
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/groups/+/AddGroupInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/groups/+/AddGroupInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 540
   ... Content-Type: multipart/form-data; boundary=---------------------------5412502961004181070544094984
@@ -494,17 +577,17 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/groups/@@contents.html
+  Location: http://localhost/++etc++site/default/groups/@@contents.html
   ...
 
 That includes Betty, Mary and Mike:
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/groups/1/@@edit.html HTTP/1.1
+  ... POST /++etc++site/default/groups/1/@@edit.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 1426
   ... Content-Type: multipart/form-data; boundary=---------------------------67523504021030130962010243745
-  ... Referer: http://localhost:8081/++etc++site/tools/groups/1/@@edit.html
+  ... Referer: http://localhost:8081/++etc++site/default/groups/1/@@edit.html
   ... 
   ... -----------------------------67523504021030130962010243745
   ... Content-Disposition: form-data; name="field.title"
@@ -554,7 +637,7 @@
 and a group "Power Users":
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/groups/+/AddGroupInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/groups/+/AddGroupInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 556
   ... Content-Type: multipart/form-data; boundary=---------------------------14430301351028860873795053640
@@ -579,13 +662,13 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/groups/@@contents.html
+  Location: http://localhost/++etc++site/default/groups/@@contents.html
   ...
 
 with users Betty, Bill, Bob, George, and Mary:
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/groups/power/@@edit.html HTTP/1.1
+  ... POST /++etc++site/default/groups/power/@@edit.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 1708
   ... Content-Type: multipart/form-data; boundary=---------------------------46600477014278930691159535998

Modified: Zope3/branches/srichter-blow-services/src/zope/app/pau/browser/principalfolder.txt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/pau/browser/principalfolder.txt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/pau/browser/principalfolder.txt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -17,45 +17,76 @@
 
 To allow Bob to log in, we'll start by adding a principal folder:
 
-
-(The following request is a bit weird.  It is part of the current
- tools UI.  It arranges for a tools site-management folder to be
- created.  We really need to rethink how we manage TTW utilities.)
-
   >>> print http(r"""
-  ... GET /++etc++site/AddISearchableAuthenticationPluginTool HTTP/1.1
+  ... POST /++etc++site/default/+/AddPrincipalFolder.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
-  ... Referer: http://localhost:8081/++etc++site/@@manageISearchableAuthenticationPluginTool.html
-  ... """)
-  HTTP/1.1 200 Ok
-  ...
-
-  >>> print http(r"""
-  ... POST /++etc++site/AddISearchableAuthenticationPluginTool/AddPrincipalFolder.html%3D HTTP/1.1
-  ... Authorization: Basic mgr:mgrpw
-  ... Content-Length: 434
-  ... Content-Type: multipart/form-data; boundary=---------------------------190685539214643056941988788830
-  ... Referer: http://localhost:8081/++etc++site/AddISearchableAuthenticationPluginTool/AddPrincipalFolder.html=
+  ... Referer: http://localhost:8081/++etc++site/default/+/
+  ... Content-Type: multipart/form-data; boundary=----------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C
   ... 
-  ... -----------------------------190685539214643056941988788830
+  ... ------------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C
   ... Content-Disposition: form-data; name="field.prefix"
   ... 
   ... users.
-  ... -----------------------------190685539214643056941988788830
+  ... ------------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C
   ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
   ... 
   ... Add
-  ... -----------------------------190685539214643056941988788830
+  ... ------------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C
   ... Content-Disposition: form-data; name="add_input_name"
   ... 
   ... users
-  ... -----------------------------190685539214643056941988788830--
+  ... ------------GYJj1mdiN891D9tNwXr91fhfZ3uDCujQQ39Rnk88qF94M1PGYEPXt5C--  
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: ../@@manageISearchableAuthenticationPluginTool.html
+  Location: http://localhost/++etc++site/default/users/@@registration.html
   ...
 
+  >>> print http(r"""
+  ... POST /++etc++site/default/users/addRegistration.html HTTP/1.1
+  ... Authorization: Basic mgr:mgrpw
+  ... Referer: http://localhost:8081/++etc++site/default/users/
+  ... Content-Type: multipart/form-data; boundary=----------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... 
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.name"
+  ... 
+  ... users
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.provided"
+  ... 
+  ... zope.app.pau.interfaces.ISearchableAuthenticationPlugin
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.provided-empty-marker"
+  ... 
+  ... 1
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.status"
+  ... 
+  ... Active
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.status-empty-marker"
+  ... 
+  ... 1
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.permission"
+  ... 
+  ... 
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="field.permission-empty-marker"
+  ... 
+  ... 1
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF
+  ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
+  ... 
+  ... Add
+  ... ------------A0RQoKkMr657cHGA0FBBfto7FJSXB3IJ3jkq2UCtaF1BUFLTVWeAPQF--
+  ... """)
+  HTTP/1.1 303 See Other
+  ...
+  Location: @@SelectedManagementView.html
+  ...
+
 We specify a prefix, `users.`.  This is used to make sure that ids
 used by this plugin don't conflict with ids of other plugins.  We also
 name ths plugin `users`.  This is the name we'll use when we configure
@@ -64,7 +95,7 @@
 Next we'll view the contents page of the principal folder:
 
   >>> print http(r"""
-  ... GET /++etc++site/tools/users/@@contents.html HTTP/1.1
+  ... GET /++etc++site/default/users/@@contents.html HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Referer: http://localhost:8081/++etc++site/@@manageISearchableAuthenticationPluginTool.html
   ... """)
@@ -74,11 +105,11 @@
 And we'll add a principal, Bob:
 
   >>> print http(r"""
-  ... POST /++etc++site/tools/users/+/AddPrincipalInformation.html%3D HTTP/1.1
+  ... POST /++etc++site/default/users/+/AddPrincipalInformation.html%3D HTTP/1.1
   ... Authorization: Basic mgr:mgrpw
   ... Content-Length: 777
   ... Content-Type: multipart/form-data; boundary=---------------------------7243003661505678908829226317
-  ... Referer: http://localhost:8081/++etc++site/tools/users/+/AddPrincipalInformation.html=
+  ... Referer: http://localhost:8081/++etc++site/default/users/+/AddPrincipalInformation.html=
   ... 
   ... -----------------------------7243003661505678908829226317
   ... Content-Disposition: form-data; name="field.login"
@@ -108,7 +139,7 @@
   ... """)
   HTTP/1.1 303 See Other
   ...
-  Location: http://localhost/++etc++site/tools/users/@@contents.html
+  Location: http://localhost/++etc++site/default/users/@@contents.html
   ...
 
 Note that we didn't pick a name.  The name, together with the folder
@@ -131,35 +162,41 @@
   >>> print http(r"""
   ... POST /++etc++site/default/LocalPAU/addRegistration.html HTTP/1.1
   ... Authorization: Basic bWdyOm1ncnB3
-  ... Content-Length: 852
-  ... Content-Type: multipart/form-data; boundary=---------------------------1649392783947785437368129046
-  ... Referer: http://localhost:8081/++etc++site/default/LocalPAU/
+  ... Content-Type: multipart/form-data; boundary=----------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... 
-  ... -----------------------------1649392783947785437368129046
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... Content-Disposition: form-data; name="field.name"
   ... 
   ... 
-  ... -----------------------------1649392783947785437368129046
-  ... Content-Disposition: form-data; name="field.interface"
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
+  ... Content-Disposition: form-data; name="field.provided"
   ... 
   ... zope.app.security.interfaces.IAuthenticationUtility
-  ... -----------------------------1649392783947785437368129046
-  ... Content-Disposition: form-data; name="field.interface-empty-marker"
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
+  ... Content-Disposition: form-data; name="field.provided-empty-marker"
   ... 
   ... 1
-  ... -----------------------------1649392783947785437368129046
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
+  ... Content-Disposition: form-data; name="field.status"
+  ... 
+  ... Active
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
+  ... Content-Disposition: form-data; name="field.status-empty-marker"
+  ... 
+  ... 1
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... Content-Disposition: form-data; name="field.permission"
   ... 
   ... 
-  ... -----------------------------1649392783947785437368129046
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... Content-Disposition: form-data; name="field.permission-empty-marker"
   ... 
   ... 1
-  ... -----------------------------1649392783947785437368129046
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq
   ... Content-Disposition: form-data; name="UPDATE_SUBMIT"
   ... 
   ... Add
-  ... -----------------------------1649392783947785437368129046--
+  ... ------------01mLTAiXW04sKSCkjnjf13EYQIvFsu2svmDMwutSuvLCNXx7JekIhxq--
   ... """)
   HTTP/1.1 303 See Other
   ...

Modified: Zope3/branches/srichter-blow-services/src/zope/app/zopetop/widget_macros.pt
===================================================================
--- Zope3/branches/srichter-blow-services/src/zope/app/zopetop/widget_macros.pt	2005-01-13 01:19:42 UTC (rev 28822)
+++ Zope3/branches/srichter-blow-services/src/zope/app/zopetop/widget_macros.pt	2005-01-13 15:51:50 UTC (rev 28823)
@@ -50,8 +50,8 @@
       </div>
     </div>
 
-    <div class="box" metal:define-macro="services_box">
-      <h5 i18n:translate="">Services</h5>
+    <div class="box" metal:define-macro="rools_box">
+      <h5 i18n:translate="">Tools</h5>
       <div class="body">
         <div class="content even">
           <img src="user_accounts.gif" width="22" height="28"

More information about the Zope3-Checkins mailing list