[Zope3-checkins] CVS: Zope3/src/zope/app/rdb - gadflyda.zcml:1.1 configure.zcml:1.8 gadflyda.py:1.5

[Stephan Richter]

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

Modified Files:
	configure.zcml gadflyda.py 
Added Files:
	gadflyda.zcml 
Log Message:
Heads up, this is the beginning of Servicegeddon. We noticed that named 
components are a pain in the butt and that we can simpluify our code a lot
by making these named components local utilities. 

So I started with the SQL Connection service and database adapters and 
simplified the code greatly. Database Adaptors are now just simple 
utilities.

I also took the oppurtunity and updated all database adapters. 

This change is not backward compatible and you will have to toss your ZODB.
Although all tests pass, I expect there to be some hickups, so feel free to 
fix or report these. 

Next I will fix up the front screen a bit and try to factor some other 
pieces. I also still miss some functionality in the Utilities, which I plan
to add.




=== Added File Zope3/src/zope/app/rdb/gadflyda.zcml ===
<configure xmlns="http://namespaces.zope.org/zope">

  <content class="zope.app.rdb.gadflyda.GadflyAdapter">
    <factory
        title="Gadfly Database Adapter"
        permission="zope.Public" />
    <require
        permission="zope.Public"
        interface="zope.app.interfaces.rdb.IZopeDatabaseAdapter" />
  </content>

</configure>


=== Zope3/src/zope/app/rdb/configure.zcml 1.7 => 1.8 ===
--- Zope3/src/zope/app/rdb/configure.zcml:1.7	Sun Aug  3 12:07:39 2003
+++ Zope3/src/zope/app/rdb/configure.zcml	Tue Aug 19 03:09:48 2003
@@ -1,29 +1,29 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <content class="zope.app.rdb.gadflyda.GadflyAdapter">
+  <content class=".ZopeDatabaseAdapter">
 
-    <factory
-        id="GadflyDA"
-        permission="zope.Public" />
-
-    <require
-        permission="zope.Public"
+    <implements
         interface="zope.app.interfaces.rdb.IZopeDatabaseAdapter" />
 
     <implements
         interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
 
     <implements
-        interface=
-        "zope.app.interfaces.services.registration.IAttributeRegisterable" />
+      interface="zope.app.interfaces.services.utility.ILocalUtility" />
+
+    <require
+        permission="zope.Public"
+        interface="zope.app.interfaces.rdb.IZopeDatabaseAdapter" />
 
   </content>
 
-  <content class="zope.app.rdb.ResultSet">
+  <content class=".ResultSet">
     <require
         permission="zope.View"
         attributes="__getitem__ __getslice__ __len__ __iter__ __contains__
                     index count __str__ __add__ __radd__" />
   </content>
+
+  <include file="gadflyda.zcml" />
 
 </configure>


=== Zope3/src/zope/app/rdb/gadflyda.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/rdb/gadflyda.py:1.4	Wed Jun  4 06:46:36 2003
+++ Zope3/src/zope/app/rdb/gadflyda.py	Tue Aug 19 03:09:48 2003
@@ -11,12 +11,10 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""
-Gadfly Database Adapter (batteries included)
+"""Gadfly Database Adapter (batteries included)
 
 $Id$
 """
-
 import gadfly
 import os