[Zope-CVS] CVS: Products/DBTab - DBTab.py:1.8 MainConfiguration.py:1.5 StorageTypes.py:1.7 version.txt:1.6

[Shane Hathaway]

Update of /cvs-repository/Products/DBTab
In directory cvs.zope.org:/tmp/cvs-serv12923

Modified Files:
	DBTab.py MainConfiguration.py StorageTypes.py version.txt 
Log Message:
Updated to latest BDBStorage and AdaptableStorage layout

=== Products/DBTab/DBTab.py 1.7 => 1.8 ===
--- Products/DBTab/DBTab.py:1.7	Wed Dec 18 17:54:41 2002
+++ Products/DBTab/DBTab.py	Mon Jan  6 11:56:38 2003
@@ -32,8 +32,6 @@
 
 database_types = {
     'DB': 'ZODB.DB',
-    'Zope2FSDatabase': 'Products.AdaptableStorage.Zope2FS',
-    'Zope2SQLDatabase': 'Products.AdaptableStorage.Zope2SQL',
     }
 
 connection_types = {


=== Products/DBTab/MainConfiguration.py 1.4 => 1.5 ===
--- Products/DBTab/MainConfiguration.py:1.4	Mon Dec 16 15:02:36 2002
+++ Products/DBTab/MainConfiguration.py	Mon Jan  6 11:56:38 2003
@@ -21,6 +21,12 @@
 from DBTab import DBTab
 from Exceptions import DBTabOverrideError
 
+try:
+    # Get the AdaptableStorage types registered, if available.
+    import Products.AdaptableStorage.StorageTypesConfiguration
+except ImportError:
+    pass
+
 # Read the configuration from $INSTANCE_HOME/dbtab.conf if available,
 # otherwise fall back to dbtab.conf.in.
 main_fn = os.path.join(INSTANCE_HOME, 'dbtab.conf')


=== Products/DBTab/StorageTypes.py 1.6 => 1.7 ===
--- Products/DBTab/StorageTypes.py:1.6	Wed Dec 18 17:19:33 2002
+++ Products/DBTab/StorageTypes.py	Mon Jan  6 11:56:38 2003
@@ -129,8 +129,7 @@
     'MappingStorage': ('ZODB.MappingStorage', None),
     'TemporaryStorage': ('Products.TemporaryFolder.TemporaryStorage', None),
     'ClientStorage': ('ZEO.ClientStorage', convertClientStorageArgs),
-    'Full': ('BDBStorage.Full', convertBDBStorageArgs),
-    'Minimal': ('BDBStorage.Minimal', convertBDBStorageArgs),
-    'Zope2FSStorage': ('Products.AdaptableStorage.Zope2FS', None),
-    'Zope2SQLStorage': ('Products.AdaptableStorage.Zope2SQL', None),
+    'BDBFullStorage': ('BDBStorage.BDBFullStorage', convertBDBStorageArgs),
+    'BDBMinimalStorage':
+    ('BDBStorage.BDBMinimalStorage', convertBDBStorageArgs),
     }


=== Products/DBTab/version.txt 1.5 => 1.6 ===
--- Products/DBTab/version.txt:1.5	Wed Dec 18 17:21:38 2002
+++ Products/DBTab/version.txt	Mon Jan  6 11:56:38 2003
@@ -1 +1 @@
-DBTab-1.0.1
+DBTab-1.0.1+