[Zope3-checkins] CVS: Zope3/src/zope/app/browser/rdb - configure.zcml:1.3.12.1 rdb.py:1.2.16.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/browser/rdb
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/browser/rdb

Modified Files:
      Tag: cw-mail-branch
	configure.zcml rdb.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/browser/rdb/configure.zcml 1.3 => 1.3.12.1 ===
--- Zope3/src/zope/app/browser/rdb/configure.zcml:1.3	Mon Apr 28 17:35:29 2003
+++ Zope3/src/zope/app/browser/rdb/configure.zcml	Sun Jun 22 10:22:41 2003
@@ -1,9 +1,7 @@
 <zopeConfigure xmlns='http://namespaces.zope.org/browser'>
 
-
 <!-- ZopeDatabaseAdapter default views -->
 
-
   <!-- XXX need an index.html that gives the source and is the def view -->
   <defaultView for="zope.app.interfaces.rdb.IZopeDatabaseAdapter"
                name="editForm.html" />
@@ -12,7 +10,7 @@
          for="zope.app.interfaces.rdb.IZopeDatabaseAdapter">
     <menuItem title="Edit" action="editForm.html"/>
     <menuItem title="Test" action="testForm.html"/>
-    </menuItems>
+  </menuItems>
 
   <pages
       for="zope.app.interfaces.rdb.IZopeDatabaseAdapter"
@@ -25,7 +23,7 @@
     <page name="connect.html" attribute="connect" />
     <page name="disconnect.html" attribute="disconnect" />
   
-    </pages>
+  </pages>
 
   <pages
       for="zope.app.interfaces.rdb.IZopeDatabaseAdapter"
@@ -35,8 +33,7 @@
     <page name="testForm.html" template="rdbtestsql.pt" />
     <page name="test.html" template="rdbtestresults.pt" />
 
-    </pages>
-
+  </pages>
 
 <!-- Gadfly DA -->
 
@@ -55,7 +52,8 @@
   <menuItem
       menu="add_component"
       for="zope.app.interfaces.container.IAdding"
-      title="Gadfly Database Adapter" 
+      title="Gadfly DA" 
+      description="A DA for the built-in 100% Pure Python Gadfly Database"
       action="zope.app.rdb.gadflyda.GadflyAdapter"
       />
 
@@ -63,7 +61,8 @@
   <menuItem
       menu="add_connection"
       for="zope.app.interfaces.container.IAdding"
-      title="Gadfly Database Adapter" 
+      title="Gadfly DA" 
+      description="A DA for the built-in 100% Pure Python Gadfly Database"
       action="zope.app.rdb.gadflyda.GadflyAdapter"
       />
 


=== Zope3/src/zope/app/browser/rdb/rdb.py 1.2 => 1.2.16.1 ===
--- Zope3/src/zope/app/browser/rdb/rdb.py:1.2	Tue Mar 25 06:43:07 2003
+++ Zope3/src/zope/app/browser/rdb/rdb.py	Sun Jun 22 10:22:41 2003
@@ -16,7 +16,7 @@
 $Id$
 """
 from zope.component import getFactory
-from zope.proxy.introspection import removeAllProxies
+from zope.proxy import removeAllProxies
 from zope.publisher.browser import BrowserView
 
 from zope.app.interfaces.container import IAdding