[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/pas/ Converted a number of the plugins to global utilities.

[Jim Fulton]

Log message for revision 28300:
  Converted a number of the plugins to global utilities.
  This simplifies configuring the pas.
  
  Moved soem browser definitions to the browser confifuration file.
  

Changed:
  U   Zope3/trunk/src/zope/app/pas/browser/configure.zcml
  U   Zope3/trunk/src/zope/app/pas/challengeplugins.zcml
  U   Zope3/trunk/src/zope/app/pas/extractionplugins.zcml

-=-
Modified: Zope3/trunk/src/zope/app/pas/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/pas/browser/configure.zcml	2004-10-30 22:51:13 UTC (rev 28299)
+++ Zope3/trunk/src/zope/app/pas/browser/configure.zcml	2004-10-30 22:51:15 UTC (rev 28300)
@@ -98,6 +98,30 @@
       description="PAS Credential Extraction and Challenge Plugin"
       />
 
+<!-- Challengers -->
+  
+  <addMenuItem
+      title="PAS Custom Realm Basic Auth Challenge Plugin"
+      description="A PAS Basic Auth Challenge Plugin"
+      class="..httpplugins.HTTPBasicAuthChallenger"
+      permission="zope.ManageContent"
+      />
 
+  <addMenuItem
+      title="Custom Form Session Challenge Plugin"
+      description="A PAS Challenge Plugin"
+      class="..browserplugins.FormChallenger"
+      permission="zope.ManageServices"
+      />
 
+<!-- Extractors -->
+
+  <addMenuItem
+      title="PAS Browser Session Extractor"
+      description="A PAS Extraction Plugin"
+      class="..browserplugins.SessionExtractor"
+      permission="zope.ManageServices"
+      />
+
+
 </zope:configure>

Modified: Zope3/trunk/src/zope/app/pas/challengeplugins.zcml
===================================================================
--- Zope3/trunk/src/zope/app/pas/challengeplugins.zcml	2004-10-30 22:51:13 UTC (rev 28299)
+++ Zope3/trunk/src/zope/app/pas/challengeplugins.zcml	2004-10-30 22:51:15 UTC (rev 28300)
@@ -2,7 +2,16 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="zope">
+
+
+  <!-- Default preconfigured basic auth -->
+  <utility
+      name="Zope Realm HTTP Basic"
+      factory=".httpplugins.HTTPBasicAuthChallenger"
+      provides=".interfaces.IChallengePlugin"
+      />
   
+  <!-- Locally custom-configured basic auth -->
   <localUtility class=".httpplugins.HTTPBasicAuthChallenger">
 
     <implements
@@ -14,35 +23,21 @@
         set_schema=".httpplugins.IHTTPBasicAuthRealm" />
 
   </localUtility>
-  
-  <browser:addMenuItem
-      title="PAS Basic Auth Challenge Plugin"
-      description="A PAS Basic Auth Challenge Plugin"
-      class=".httpplugins.HTTPBasicAuthChallenger"
-      permission="zope.ManageContent"
+
+  <utility
+      name="No Challenge if Authenticated"
+      factory=".generic.AlreadyAuthenticatedUserChallenger"
+      provides=".interfaces.IChallengePlugin"
       />
 
-  <localUtility class=".generic.AlreadyAuthenticatedUserChallenger">
-
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
-
-  </localUtility>
   
-  <browser:addMenuItem
-      title="PAS Authenticated User Challenge Plugin"
-      description="A PAS Authenticated User Challenge Plugin"
-      class=".generic.AlreadyAuthenticatedUserChallenger"
-      permission="zope.ManageServices"
+  <utility
+      name="Rediect to loginForm.html"
+      factory=".browserplugins.FormChallenger"
+      provides=".interfaces.IChallengePlugin"
       />
 
-  <browser:addMenuItem
-      title="PAS Browser Session Challenge Plugin"
-      description="A PAS Challenge Plugin"
-      class="zope.app.pas.browserplugins.FormChallenger"
-      permission="zope.ManageServices"
-      />
-
+  <!-- Configure where to redirect to -->
   <localUtility class=".browserplugins.FormChallenger">
 
     <implements

Modified: Zope3/trunk/src/zope/app/pas/extractionplugins.zcml
===================================================================
--- Zope3/trunk/src/zope/app/pas/extractionplugins.zcml	2004-10-30 22:51:13 UTC (rev 28299)
+++ Zope3/trunk/src/zope/app/pas/extractionplugins.zcml	2004-10-30 22:51:15 UTC (rev 28300)
@@ -3,32 +3,16 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="zope">
 
-  <localUtility class=".httpplugins.HTTPBasicAuthExtractor">
+<utility
+    name="HTTP Basic"
+    provides=".interfaces.IExtractionPlugin"
+    factory=".httpplugins.HTTPBasicAuthExtractor"
+    />
 
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+<utility
+    name="Session"
+    provides=".interfaces.IExtractionPlugin"
+    factory=".browserplugins.SessionExtractor"
+    />
 
-  </localUtility>
-
-  <browser:addMenuItem
-      title="PAS HTTP Basic Auth Extractor"
-      description="A PAS Extraction Plugin"
-      class="zope.app.pas.httpplugins.HTTPBasicAuthExtractor"
-      permission="zope.ManageContent"
-      />
-
-  <localUtility class=".browserplugins.SessionExtractor">
-
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
-
-  </localUtility>
-
-  <browser:addMenuItem
-      title="PAS Browser Session Extractor"
-      description="A PAS Extraction Plugin"
-      class="zope.app.pas.browserplugins.SessionExtractor"
-      permission="zope.ManageServices"
-      />
-
 </configure>