Changeset 9222 for main

Timestamp:

21 Sep 2012, 21:07:14 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust configuration to trunk merged with uli-zc-async.

Location:

main/waeup.uniben/trunk

Files:

• etc/debug.ini.in (modified) (1 diff)
• etc/deploy.ini.in (modified) (1 diff)
• etc/profile.ini.in (modified) (1 diff)
• etc/site.zcml.in (modified) (1 diff)
• etc/zeo1.ini.in (modified) (1 diff)
• etc/zeo2.ini.in (modified) (1 diff)
• etc/zope.conf.in (modified) (1 diff)
• etc/zope_zeo1.conf.in (modified) (1 diff)
• etc/zope_zeo2.conf.in (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/waeup/uniben/students/browser.py (modified) (1 diff)

main/waeup.uniben/trunk/etc/debug.ini.in

@@ -66 +66 @@
 # set the name of the zope.conf file
 zope_conf = %(here)s/zope.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt

main/waeup.uniben/trunk/etc/deploy.ini.in

@@ -59 +59 @@
 # set the name of the zope.conf file
 zope_conf = %(here)s/zope.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt

main/waeup.uniben/trunk/etc/profile.ini.in

@@ -70 +70 @@
 # set the name of the zope.conf file
 zope_conf = %(here)s/zope.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt

main/waeup.uniben/trunk/etc/site.zcml.in

@@ -5 +5 @@
   <include package="waeup.uniben" />
   <include package="waeup.uniben" file="mail.zcml" />
+
+  <!-- install job container
+
+       install a job container for asynchronous jobs. Pick one of the
+       two possibilites: 'single' for installation in the one big ZODB
+       or 'multidb' for setup with a dedicated ZODB for job handling.
+  -->
+  <!-- include package="waeup.kofa" file="async_single.zcml" / -->
+  <include package="waeup.kofa" file="async_multidb.zcml" />
+
+  <!-- install dispatcher and other needed async components
+
+       install other needed components for asynchronous jobs. Pick one
+       of the two possibilities: 'basic_dispatcher' for single ZODB
+       setup, 'multidb_dispatcher' for setup with a dedicated ZODB for
+       job handling. Make sure the setting matches the setting picked
+       above. -->
+  <!-- include package="zc.async" file="basic_dispatcher_policy.zcml" / -->
+  <include package="zc.async" file="multidb_dispatcher_policy.zcml" />
 
   <!-- Where should the datacenter reside by default? -->

main/waeup.uniben/trunk/etc/zeo1.ini.in

@@ -61 +61 @@
 # set the name of the zope.conf file
 zope_conf = %(here)s/zope_zeo1.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt

main/waeup.uniben/trunk/etc/zeo2.ini.in

@@ -61 +61 @@
 # set the name of the zope.conf file
 zope_conf = %(here)s/zope_zeo2.conf
+env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt

main/waeup.uniben/trunk/etc/zope.conf.in

@@ -28 +28 @@
 </zodb>
 
+<zodb async>
+  <filestorage>
+    # create true
+    path ${zope_conf:filestorage}/Data.async.fs
+  </filestorage>
+</zodb>
+
 <eventlog>
   # This sets up logging to a file.

main/waeup.uniben/trunk/etc/zope_zeo1.conf.in

@@ -61 +61 @@
 </zodb>
 
+<zodb async>
+  <zeoclient>
+    server localhost:7010
+    storage async
+    name async
+    # ZEO client cache, in bytes
+    cache-size 20MB
+    # Uncomment to have a persistent disk cache
+    client ${zope_conf_zeo_1:filestorage}/zeo1_async
+  </zeoclient>
+</zodb>
+
 <eventlog>
   # This sets up logging to a file.

main/waeup.uniben/trunk/etc/zope_zeo2.conf.in

@@ -61 +61 @@
 </zodb>
 
+<zodb async>
+  <zeoclient>
+    server localhost:7010
+    storage async
+    name async
+    # ZEO client cache, in bytes
+    cache-size 20MB
+    # Uncomment to have a persistent disk cache
+    client ${zope_conf_zeo_2:filestorage}/zeo2_async
+  </zeoclient>
+</zodb>
+
 <eventlog>
   # This sets up logging to a file.

main/waeup.uniben/trunk/setup.py

@@ -95 +95 @@
       kofactl = grokcore.startup:zdaemon_controller
       [paste.app_factory]
-      main = grokcore.startup:application_factory
-      debug = grokcore.startup:debug_application_factory
+      main = waeup.kofa.startup:env_app_factory
+      debug = waeup.kofa.startup:env_debug_app_factory
       """,
       )

main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py

@@ -21 +21 @@
 from waeup.kofa.interfaces import REQUESTED
 from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
-from waeup.kofa.browser import KofaEditFormPage
+from waeup.kofa.browser.layout import KofaEditFormPage
 from waeup.kofa.browser.viewlets import ManageActionButton
 from waeup.kofa.browser.layout import action