Changeset 9222 for main


Ignore:
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:
11 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.uniben/trunk/etc/debug.ini.in

    r8770 r9222  
    6666# set the name of the zope.conf file
    6767zope_conf = %(here)s/zope.conf
     68env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
  • main/waeup.uniben/trunk/etc/deploy.ini.in

    r8770 r9222  
    5959# set the name of the zope.conf file
    6060zope_conf = %(here)s/zope.conf
     61env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
  • main/waeup.uniben/trunk/etc/profile.ini.in

    r8770 r9222  
    7070# set the name of the zope.conf file
    7171zope_conf = %(here)s/zope.conf
     72env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
  • main/waeup.uniben/trunk/etc/site.zcml.in

    r8020 r9222  
    55  <include package="waeup.uniben" />
    66  <include package="waeup.uniben" file="mail.zcml" />
     7
     8  <!-- install job container
     9
     10       install a job container for asynchronous jobs. Pick one of the
     11       two possibilites: 'single' for installation in the one big ZODB
     12       or 'multidb' for setup with a dedicated ZODB for job handling.
     13  -->
     14  <!-- include package="waeup.kofa" file="async_single.zcml" / -->
     15  <include package="waeup.kofa" file="async_multidb.zcml" />
     16
     17  <!-- install dispatcher and other needed async components
     18
     19       install other needed components for asynchronous jobs. Pick one
     20       of the two possibilities: 'basic_dispatcher' for single ZODB
     21       setup, 'multidb_dispatcher' for setup with a dedicated ZODB for
     22       job handling. Make sure the setting matches the setting picked
     23       above. -->
     24  <!-- include package="zc.async" file="basic_dispatcher_policy.zcml" / -->
     25  <include package="zc.async" file="multidb_dispatcher_policy.zcml" />
    726
    827  <!-- Where should the datacenter reside by default? -->
  • main/waeup.uniben/trunk/etc/zeo1.ini.in

    r8770 r9222  
    6161# set the name of the zope.conf file
    6262zope_conf = %(here)s/zope_zeo1.conf
     63env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
  • main/waeup.uniben/trunk/etc/zeo2.ini.in

    r8770 r9222  
    6161# set the name of the zope.conf file
    6262zope_conf = %(here)s/zope_zeo2.conf
     63env_vars = ZC_ASYNC_UUID ${buildout:directory}/var/uuid1.txt
  • main/waeup.uniben/trunk/etc/zope.conf.in

    r5495 r9222  
    2828</zodb>
    2929
     30<zodb async>
     31  <filestorage>
     32    # create true
     33    path ${zope_conf:filestorage}/Data.async.fs
     34  </filestorage>
     35</zodb>
     36
    3037<eventlog>
    3138  # This sets up logging to a file.
  • main/waeup.uniben/trunk/etc/zope_zeo1.conf.in

    r8133 r9222  
    6161</zodb>
    6262
     63<zodb async>
     64  <zeoclient>
     65    server localhost:7010
     66    storage async
     67    name async
     68    # ZEO client cache, in bytes
     69    cache-size 20MB
     70    # Uncomment to have a persistent disk cache
     71    client ${zope_conf_zeo_1:filestorage}/zeo1_async
     72  </zeoclient>
     73</zodb>
     74
    6375<eventlog>
    6476  # This sets up logging to a file.
  • main/waeup.uniben/trunk/etc/zope_zeo2.conf.in

    r8133 r9222  
    6161</zodb>
    6262
     63<zodb async>
     64  <zeoclient>
     65    server localhost:7010
     66    storage async
     67    name async
     68    # ZEO client cache, in bytes
     69    cache-size 20MB
     70    # Uncomment to have a persistent disk cache
     71    client ${zope_conf_zeo_2:filestorage}/zeo2_async
     72  </zeoclient>
     73</zodb>
     74
    6375<eventlog>
    6476  # This sets up logging to a file.
  • main/waeup.uniben/trunk/setup.py

    r8828 r9222  
    9595      kofactl = grokcore.startup:zdaemon_controller
    9696      [paste.app_factory]
    97       main = grokcore.startup:application_factory
    98       debug = grokcore.startup:debug_application_factory
     97      main = waeup.kofa.startup:env_app_factory
     98      debug = waeup.kofa.startup:env_debug_app_factory
    9999      """,
    100100      )
  • main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py

    r9210 r9222  
    2121from waeup.kofa.interfaces import REQUESTED
    2222from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
    23 from waeup.kofa.browser import KofaEditFormPage
     23from waeup.kofa.browser.layout import KofaEditFormPage
    2424from waeup.kofa.browser.viewlets import ManageActionButton
    2525from waeup.kofa.browser.layout import action
Note: See TracChangeset for help on using the changeset viewer.