[Checkins] SVN: ldapadapter/trunk/src/ldapadapter/ Fix deprecation warnings for Zope 3.3.

[Martijn Faassen]

Log message for revision 70371:
  Fix deprecation warnings for Zope 3.3.
  

Changed:
  U   ldapadapter/trunk/src/ldapadapter/browser/check.py
  U   ldapadapter/trunk/src/ldapadapter/browser/configure.zcml
  U   ldapadapter/trunk/src/ldapadapter/configure.zcml

-=-
Modified: ldapadapter/trunk/src/ldapadapter/browser/check.py
===================================================================
--- ldapadapter/trunk/src/ldapadapter/browser/check.py	2006-09-25 16:08:36 UTC (rev 70370)
+++ ldapadapter/trunk/src/ldapadapter/browser/check.py	2006-09-25 16:08:50 UTC (rev 70371)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors.
+# Copyright (c) 2004-2006 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -16,7 +16,7 @@
 $Id:$
 """
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 from ldapadapter.interfaces import IManageableLDAPAdapter
 from ldapadapter.interfaces import ICheckLDAPAdapter

Modified: ldapadapter/trunk/src/ldapadapter/browser/configure.zcml
===================================================================
--- ldapadapter/trunk/src/ldapadapter/browser/configure.zcml	2006-09-25 16:08:36 UTC (rev 70370)
+++ ldapadapter/trunk/src/ldapadapter/browser/configure.zcml	2006-09-25 16:08:50 UTC (rev 70371)
@@ -4,12 +4,6 @@
     i18n_domain="ldapadapter">
 
   <!-- LDAPAdapter -->
-  <tool
-      interface="ldapadapter.interfaces.ILDAPAdapter"
-      title="LDAP Adapter"
-      description="A LDAP adapter."
-      />
-
   <addform
       name="AddLDAPAdapter.html"
       label="Add a LDAP Adapter"

Modified: ldapadapter/trunk/src/ldapadapter/configure.zcml
===================================================================
--- ldapadapter/trunk/src/ldapadapter/configure.zcml	2006-09-25 16:08:36 UTC (rev 70370)
+++ ldapadapter/trunk/src/ldapadapter/configure.zcml	2006-09-25 16:08:50 UTC (rev 70371)
@@ -5,17 +5,14 @@
     i18n_domain="ldapadapter"
     >
 
-  <content class="ldapadapter.utility.ManageableLDAPAdapter">
+  <class class="ldapadapter.utility.ManageableLDAPAdapter">
 
     <factory
         id="ldapadapter.utility.ManageableLDAPAdapter" />
 
     <implements
-        interface="zope.app.component.interfaces.ILocalUtility" />
+        interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
-    <implements
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
-
     <require
         permission="zope.ManageServices"
         interface="ldapadapter.interfaces.IManageableLDAPAdapter"
@@ -26,13 +23,13 @@
         set_schema="ldapadapter.interfaces.IManageableLDAPAdapter"
         />
 
-  </content>
+  </class>
 
-  <vocabulary
+  <utility
+      provides="zope.schema.interfaces.IVocabularyFactory"
+      component="zope.app.component.vocabulary.UtilityVocabulary"
       name="LDAP Adapter Names"
-      factory="zope.app.utility.vocabulary.UtilityVocabulary"
-      interface="ldapadapter.interfaces.ILDAPAdapter"
-      nameOnly="True" />
+      />
 
   <!-- LDAP connection test adapter -->
   <adapter