[Checkins] SVN: Zope3/trunk/ Prepare to remove package 'zope.app.introspector': reconfigure 'zope.app.apidoc.codemodule' to not use the package.

[Florent Xicluna]

Log message for revision 70172:
  Prepare to remove package 'zope.app.introspector': reconfigure 'zope.app.apidoc.codemodule' to not use the package.

Changed:
  U   Zope3/trunk/doc/CHANGES.txt
  U   Zope3/trunk/src/zope/app/apidoc/codemodule/browser/introspector.zcml
  U   Zope3/trunk/src/zope/app/apidoc/enabled.zcml
  U   Zope3/trunk/src/zope/app/configure.zcml

-=-
Modified: Zope3/trunk/doc/CHANGES.txt
===================================================================
--- Zope3/trunk/doc/CHANGES.txt	2006-09-14 12:04:37 UTC (rev 70171)
+++ Zope3/trunk/doc/CHANGES.txt	2006-09-14 12:33:09 UTC (rev 70172)
@@ -37,6 +37,9 @@
 
     Restructuring
 
+      - Removed deprecated ``zope.app.introspector`` package.
+        See ``zope.app.apidoc.codemodule`` for the introspector feature.
+
       - Implemented the ZCML feature `deprecatedlayers` which is provided by
         default. To turn off and remove the deprecated packages `layers` and
         `skins`, you need to remove file `zope.app.layers-meta.zcml` from the

Modified: Zope3/trunk/src/zope/app/apidoc/codemodule/browser/introspector.zcml
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/codemodule/browser/introspector.zcml	2006-09-14 12:04:37 UTC (rev 70171)
+++ Zope3/trunk/src/zope/app/apidoc/codemodule/browser/introspector.zcml	2006-09-14 12:33:09 UTC (rev 70172)
@@ -9,6 +9,7 @@
       provides="zope.traversing.interfaces.ITraversable" for="*"
       factory=".introspector.annotationsNamespace"
       />
+
   <zope:adapter
       name="annotations"
       provides="zope.traversing.interfaces.ITraversable" for="*"
@@ -22,6 +23,7 @@
       for="zope.interface.common.sequence.IMinimalSequence"
       factory=".introspector.sequenceItemsNamespace"
       />
+
   <zope:adapter
       name="items"
       provides="zope.traversing.interfaces.ITraversable"
@@ -36,6 +38,7 @@
       for="zope.interface.common.mapping.IItemMapping"
       factory=".introspector.mappingItemsNamespace"
       />
+
   <zope:adapter
       name="items"
       provides="zope.traversing.interfaces.ITraversable"
@@ -47,7 +50,7 @@
       name="introspector.html"
       for="*"
       class=".introspector.Introspector"
-      permission="zope.app.introspector.Introspect"
+      permission="zope.app.apidoc.UseAPIDoc"
       menu="zmi_views" title="Introspector"
       template="introspector.pt"
       />

Modified: Zope3/trunk/src/zope/app/apidoc/enabled.zcml
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/enabled.zcml	2006-09-14 12:04:37 UTC (rev 70171)
+++ Zope3/trunk/src/zope/app/apidoc/enabled.zcml	2006-09-14 12:33:09 UTC (rev 70172)
@@ -1,14 +1,25 @@
 <configure
-  xmlns="http://namespaces.zope.org/zope"
-  xmlns:apidoc="http://namespaces.zope.org/apidoc"
-  xmlns:zcml="http://namespaces.zope.org/zcml"
-  i18n_domain="zope">
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:apidoc="http://namespaces.zope.org/apidoc"
+    xmlns:meta="http://namespaces.zope.org/meta"
+    i18n_domain="zope">
 
   <permission
       id="zope.app.apidoc.UseAPIDoc"
       title="[zope.app.apidoc.UseAPIDoc] Access Online API documentation"
       />
 
+  <permission
+      id="zope.app.introspector.Introspect"
+      title=
+  "[zope.app.introspector.Introspect] Introspect Object Classes and Interfaces"
+      />
+
+  <meta:redefinePermission
+      from="zope.app.introspector.Introspect"
+      to="zope.app.apidoc.UseAPIDoc"
+      />
+
   <class class=".apidoc.APIDocumentation">
     <require
         interface="zope.app.container.interfaces.IReadContainer"

Modified: Zope3/trunk/src/zope/app/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/configure.zcml	2006-09-14 12:04:37 UTC (rev 70171)
+++ Zope3/trunk/src/zope/app/configure.zcml	2006-09-14 12:33:09 UTC (rev 70172)
@@ -71,7 +71,6 @@
 
   <include package="zope.app.applicationcontrol" />
   <include package="zope.dublincore" />
-  <include package="zope.app.introspector" />
   <include package="zope.app.wsgi" />