[Checkins] SVN: bluebream/trunk/ Since BlueBream requires ZODB 3.9, FileStorage need not be

[Baiju M]

Log message for revision 110134:
  Since BlueBream requires ZODB 3.9, FileStorage need not be
  wrapped with BlobStorage proxy to get ZODB blobs support.
  

Changed:
  U   bluebream/trunk/CHANGES.txt
  U   bluebream/trunk/src/bluebream/bluebream_base/project_template/templates/zope_conf.in
  U   bluebream/trunk/src/bluebream/bluebream_base/tests/bluebream.txt
  U   bluebream/trunk/src/bluebream/bluebream_simple/project_template/templates/zope_conf.in
  U   bluebream/trunk/src/bluebream/bluebream_simple/tests/bluebream.txt

-=-
Modified: bluebream/trunk/CHANGES.txt
===================================================================
--- bluebream/trunk/CHANGES.txt	2010-03-24 02:05:36 UTC (rev 110133)
+++ bluebream/trunk/CHANGES.txt	2010-03-24 02:20:46 UTC (rev 110134)
@@ -4,6 +4,9 @@
 1.0a5 (unreleased)
 ------------------
 
+- Since BlueBream requires ZODB 3.9, FileStorage need not be
+  wrapped with BlobStorage proxy to get ZODB blobs support.
+
 - The default ZODB blob layout should be 'bushy'
   Fix LP #543525
 

Modified: bluebream/trunk/src/bluebream/bluebream_base/project_template/templates/zope_conf.in
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/project_template/templates/zope_conf.in	2010-03-24 02:05:36 UTC (rev 110133)
+++ bluebream/trunk/src/bluebream/bluebream_base/project_template/templates/zope_conf.in	2010-03-24 02:20:46 UTC (rev 110134)
@@ -2,17 +2,11 @@
 site-definition ${config:site_zcml}
 
 <zodb>
-  # Wrap standard FileStorage with BlobStorage proxy to get ZODB blobs
-  # support.
-  # This won't be needed with ZODB 3.9, as its FileStorage supports
-  # blobs by itself. If you use ZODB 3.9, remove the proxy and specify
-  # the blob-dir parameter right in in filestorage, just after path.
-  <blobstorage>
+
+  <filestorage>
+    path ${config:filestorage}/Data.fs
     blob-dir ${config:blob}
-    <filestorage>
-      path ${config:filestorage}/Data.fs
-    </filestorage>
-  </blobstorage>
+  </filestorage>
 
 # Uncomment this if you want to connect to a ZEO server instead:
 #  <zeoclient>

Modified: bluebream/trunk/src/bluebream/bluebream_base/tests/bluebream.txt
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_base/tests/bluebream.txt	2010-03-24 02:05:36 UTC (rev 110133)
+++ bluebream/trunk/src/bluebream/bluebream_base/tests/bluebream.txt	2010-03-24 02:20:46 UTC (rev 110134)
@@ -83,10 +83,6 @@
     Copying zope_conf.in to ./sample/templates/zope_conf.in
   Recursing into var
     Creating ./sample/var/
-    Recursing into blob
-      Creating ./sample/var/blob/
-      Recursing into tmp
-        Creating ./sample/var/blob/tmp/
     Recursing into filestorage
       Creating ./sample/var/filestorage/
       Copying README.txt to ./sample/var/filestorage/README.txt

Modified: bluebream/trunk/src/bluebream/bluebream_simple/project_template/templates/zope_conf.in
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/project_template/templates/zope_conf.in	2010-03-24 02:05:36 UTC (rev 110133)
+++ bluebream/trunk/src/bluebream/bluebream_simple/project_template/templates/zope_conf.in	2010-03-24 02:20:46 UTC (rev 110134)
@@ -2,17 +2,11 @@
 site-definition ${config:site_zcml}
 
 <zodb>
-  # Wrap standard FileStorage with BlobStorage proxy to get ZODB blobs
-  # support.
-  # This won't be needed with ZODB 3.9, as its FileStorage supports
-  # blobs by itself. If you use ZODB 3.9, remove the proxy and specify
-  # the blob-dir parameter right in in filestorage, just after path.
-  <blobstorage>
+
+  <filestorage>
+    path ${config:filestorage}/Data.fs
     blob-dir ${config:blob}
-    <filestorage>
-      path ${config:filestorage}/Data.fs
-    </filestorage>
-  </blobstorage>
+  </filestorage>
 
 # Uncomment this if you want to connect to a ZEO server instead:
 #  <zeoclient>

Modified: bluebream/trunk/src/bluebream/bluebream_simple/tests/bluebream.txt
===================================================================
--- bluebream/trunk/src/bluebream/bluebream_simple/tests/bluebream.txt	2010-03-24 02:05:36 UTC (rev 110133)
+++ bluebream/trunk/src/bluebream/bluebream_simple/tests/bluebream.txt	2010-03-24 02:20:46 UTC (rev 110134)
@@ -62,10 +62,6 @@
     Copying zope_conf.in to ./sample/templates/zope_conf.in
   Recursing into var
     Creating ./sample/var/
-    Recursing into blob
-      Creating ./sample/var/blob/
-      Recursing into tmp
-        Creating ./sample/var/blob/tmp/
     Recursing into filestorage
       Creating ./sample/var/filestorage/
       Copying README.txt to ./sample/var/filestorage/README.txt
@@ -129,10 +125,6 @@
     Copying zope_conf.in to ./Sample/templates/zope_conf.in
   Recursing into var
     Creating ./Sample/var/
-    Recursing into blob
-      Creating ./Sample/var/blob/
-      Recursing into tmp
-        Creating ./Sample/var/blob/tmp/
     Recursing into filestorage
       Creating ./Sample/var/filestorage/
       Copying README.txt to ./Sample/var/filestorage/README.txt