Remove temp_folder mount point from default configuration.

Most code related to temp_folder was already removed in 4.0a1.

CHANGES.rst

@@ -25,6 +25,8 @@ Features Added
 Restructuring
 +++++++++++++
 
+- Remove temp_folder mount point from default configuration.
+
 - Split a WSGI part out of `Zope2.Startup.ZopeStarter`.
 
 - Add new `Zope2.Startup.config` module to hold configuration.

src/OFS/tests/testAppInitializer.py

@@ -25,7 +25,7 @@ import Zope2.Startup
 TEMPNAME = tempfile.mktemp()
 TEMPPRODUCTS = os.path.join(TEMPNAME, "Products")
 
-bad_cfg = """
+good_cfg = """
 instancehome <<INSTANCE_HOME>>
 
 <zodb_db main>
@@ -36,17 +36,6 @@ instancehome <<INSTANCE_HOME>>
 </zodb_db>
 """
 
-good_cfg = bad_cfg + """
-<zodb_db temporary>
-    # Temporary storage database (for sessions)
-    <temporarystorage>
-      name temporary storage for sessioning
-    </temporarystorage>
-    mount-point /temp_folder
-   container-class Products.TemporaryFolder.TemporaryContainer
-</zodb_db>
-"""
-
 
 def getSchema():
     startup = os.path.dirname(os.path.realpath(Zope2.Startup.__file__))

src/Products/ZODBMountPoint/MountedObject.py

@@ -350,9 +350,6 @@ def manage_getMountStatus(dispatcher):
     return res
 
 
-# DM 2005-05-17: change default for 'create_mount_points' as
-#  otherwise (after our fix) 'temp_folder' can no longer be mounted
-#def manage_addMounts(dispatcher, paths=(), create_mount_points=0,
 def manage_addMounts(dispatcher, paths=(), create_mount_points=True,
                      REQUEST=None):
     """Adds MountedObjects at the requested paths.

src/Zope2/Startup/tests/test_schema.py

@@ -176,14 +176,12 @@ class StartupTestCase(unittest.TestCase):
               <filestorage>
                path <<INSTANCE_HOME>>/var/Data.fs
                </filestorage>
-                connection-class  Products.TemporaryFolder.LowConflictConnection.LowConflictConnection
                 mount-point                    /
                 cache-size                     5000
                 pool-size                      7
             </zodb_db>
             """)
-        self.assertEqual(conf.databases[0].config.connection_class.__name__,
-                         'LowConflictConnection')
+        self.assertEqual(conf.databases[0].config.cache_size, 5000)
 
     def test_max_conflict_retries_default(self):
         conf, handler = self.load_config_text("""\

src/Zope2/utilities/skel/etc/base.conf.in

@@ -24,11 +24,3 @@ instancehome $INSTANCE
    </filestorage>
    mount-point /
 </zodb_db>
-
-<zodb_db temporary>
-   <temporarystorage>
-     name temporary storage for sessioning
-   </temporarystorage>
-   mount-point /temp_folder
-   container-class Products.TemporaryFolder.TemporaryContainer
-</zodb_db>

src/Zope2/utilities/skel/etc/example.conf.in

@@ -590,15 +590,6 @@ instancehome $INSTANCE
     mount-point /
 </zodb_db>
 
-<zodb_db temporary>
-    # Temporary storage database (for sessions)
-    <temporarystorage>
-      name temporary storage for sessioning
-    </temporarystorage>
-    mount-point /temp_folder
-    container-class Products.TemporaryFolder.TemporaryContainer
-</zodb_db>
-
 # Other storage examples
 #
 # ZEO client storage: