Changeset 5495


Ignore:
Timestamp:
25 Aug 2010, 00:32:07 (14 years ago)
Author:
uli
Message:

Merge changes from ulif-paster branch back into trunk. CAUTION: After this update and running buildout, the old Data.fs will be lost! Make a backup before updating.

Location:
main/waeup.sirp/trunk
Files:
4 edited
7 copied

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/trunk

    • Property svn:ignore

      •  

        old new  
        33parts
        44.installed.cfg
         5var

  • main/waeup.sirp/trunk/README.txt

    r5329 r5495  
    7777You can start Zope with the with the following command:
    7878
    79     $ bin/zopectl fg
     79    $ bin/sirpctl fg
     80
     81Alternatively you can do:
     82
     83    $ bin/paster serve parts/etc/deploy.ini
    8084
    8185If you now connect to port 8080 and log in with username 'grok',

  • main/waeup.sirp/trunk/buildout.cfg

    r5433 r5495  
    11[buildout]
    22develop = .
    3 parts = app data zopectl i18n test waeupdocs coverage-detect coverage-report
    4 #find-links = http://download.zope.org/distribution/
    5 #newest = false
    6 #extends= http://grok.zope.org/releaseinfo/grok-1.0.cfg
     3parts =
     4    eggbasket
     5    app
     6    i18n
     7    test
     8    mkdirs
     9    zpasswd
     10    zope_conf
     11    site_zcml
     12    zdaemon_conf
     13    deploy_ini
     14    debug_ini
     15    waeupdocs
     16    coverage-detect
     17    coverage-report
     18# For backward compatibility, telling buildout not to throw away
     19# the data and log subdirectories from the parts directory.
     20    data
     21    log
     22newest = false
     23
     24#extends = versions.cfg
    725extends= http://grok.zope.org/releaseinfo/grok-1.1.cfg
    8 #extends = http://svn.zope.org/*checkout*/groktoolkit/trunk/grok.cfg
     26# eggs will be installed in the default buildout location
     27# (see .buildout/default.cfg in your home directory)
     28# unless you specify an eggs-directory option here.
     29
    930versions = versions
    1031
    … …  
    2142lovely.recipe = 1.0.0    # Pinned to prevent buildout svn-error.
    2243
     44
    2345[app]
    24 recipe = zc.zope3recipes>=0.5.3:application
     46recipe = zc.recipe.egg
    2547eggs = waeup.sirp
    26 site.zcml = <include package="waeup.sirp" />
    27             <include package="zope.app.twisted" />
    28             <configure i18n_domain="waeup.sirp">
    29               <unauthenticatedPrincipal id="zope.anybody"
    30                                         title="Unauthenticated User" />
    31               <unauthenticatedGroup id="zope.Anybody"
    32                                     title="Unauthenticated Users" />
    33               <authenticatedGroup id="zope.Authenticated"
    34                                 title="Authenticated Users" />
    35               <everybodyGroup id="zope.Everybody"
    36                               title="All Users" />
    37               <principal id="zope.manager"
    38                          title="Manager"
    39                          login="grok"
    40                          password_manager="Plain Text"
    41                          password="grok"
    42                          />
     48       z3c.evalexception>=2.0
     49       Paste
     50       PasteScript
     51       PasteDeploy
     52interpreter = python-console
    4353
    44               <grant permission="zope.View"
    45                      principal="zope.Authenticated" />
    46               <grant permission="zope.app.dublincore.view"
    47                      principal="zope.Authenticated" />
     54[mkdirs]
     55recipe = z3c.recipe.mkdir
     56paths =
     57    ${zope_conf:filestorage}
     58    ${zope_conf:logfiles}
     59    ${zope_conf:blobstorage}
    4860
    49               <!-- Replace the following directive if you don't want
    50                    public access -->
    51               <grant permission="zope.View"
    52                      principal="zope.Anybody" />
    53               <grant permission="zope.app.dublincore.view"
    54                      principal="zope.Anybody" />
     61[test]
     62recipe = zc.recipe.testrunner
     63eggs = waeup.sirp
     64defaults = ['--tests-pattern', '^f?tests$', '-v']
    5565
    56               <grant permission="waeup.Public"
    57                      principal="zope.Everybody" />
    58           <grant permission="waeup.Anonymous"
    59                      principal="zope.Anybody" />
     66# this section named so that the i18n scripts are called bin/i18n...
     67[i18n]
     68recipe = z3c.recipe.i18n:i18n
     69packages = waeup.sirp
     70eggs = waeup.sirp
     71domain = waeup.sirp
     72output = src/waeup/sirp/locales
     73zcml =
    6074
    61               <role id="zope.Manager" title="Site Manager" />
    62               <role id="zope.Member" title="Site Member" />
    63               <grantAll role="zope.Manager" />
    64               <grant role="zope.Manager"
    65                      principal="zope.manager" />
    66            </configure>
     75# This section is named so that the zpasswd utility is
     76# called `zpasswd`
     77[zpasswd]
     78recipe = z3c.recipe.dev:script
     79eggs = waeup.sirp
     80module = zope.app.server.zpasswd
     81method = main
    6782
     83[zope_conf]
     84recipe = collective.recipe.template
     85input = etc/zope.conf.in
     86output = ${buildout:parts-directory}/etc/zope.conf
     87filestorage = ${buildout:directory}/var/filestorage
     88blobstorage = ${buildout:directory}/var/blobstorage
     89logfiles = ${buildout:directory}/var/log
     90extra =
     91# extra = <grokwarnings>True</grokwarnings>
     92# 'extra' is copied verbatim. Use it for product config sections and so.
     93
     94# The [data] and [log] parts are still in here to instruct buildout to not
     95# unintentionally throw away the parts/data and parts/log subdirectories
     96# that contain the Data.fs and the log files. These files should be
     97# copied to the new locations. See the upgrade notes for more information.
    6898[data]
    6999recipe = zc.recipe.filestorage
    70100
    71 # this section named so that the start/stop script is called bin/zopectl
    72 [zopectl]
    73 recipe = zc.zope3recipes:instance
    74 application = app
    75 zope.conf = ${data:zconfig}
     101[log]
     102recipe = zc.recipe.filestorage
    76103
    77 [test]
    78 recipe = zc.recipe.testrunner
    79 eggs = waeup.sirp [test]
    80 defaults = ['--tests-pattern', '^f?tests$', '-v']
     104[site_zcml]
     105recipe = collective.recipe.template
     106input = etc/site.zcml.in
     107output = ${buildout:parts-directory}/etc/site.zcml
     108
     109[zdaemon_conf]
     110recipe = collective.recipe.template
     111input = etc/zdaemon.conf.in
     112output = ${buildout:parts-directory}/etc/zdaemon.conf
     113
     114[deploy_ini]
     115recipe = collective.recipe.template
     116input = etc/deploy.ini.in
     117output = ${buildout:parts-directory}/etc/deploy.ini
     118
     119[debug_ini]
     120recipe = collective.recipe.template
     121input = etc/debug.ini.in
     122output = ${buildout:parts-directory}/etc/debug.ini
     123
     124[eggbasket]
     125recipe = z3c.recipe.eggbasket
     126eggs = grok
     127url = http://grok.zope.org/releaseinfo/grok-eggs-1.1.tgz
     128
     129[waeupdocs]
     130recipe = collective.recipe.sphinxbuilder
     131eggs = waeup.sirp
     132source = ${buildout:directory}/docs/source
     133build = ${buildout:directory}/docs/build
    81134
    82135# Collect test coverage data.
    … …  
    94147scripts = coveragereport
    95148arguments = ('${buildout:parts-directory}/coverage-detect/coverage', '${buildout:directory}/coverage-report')
    96 
    97 
    98 
    99 # this section named so that the i18n scripts are called bin/i18n...
    100 [i18n]
    101 recipe = lovely.recipe:i18n
    102 package = waeup.sirp
    103 domain = waeup.sirp
    104 location = src/waeup/sirp
    105 output = locales
    106 
    107 [waeupdocs]
    108 recipe = collective.recipe.sphinxbuilder
    109 eggs = waeup.sirp
    110 source = ${buildout:directory}/docs/source
    111 build = ${buildout:directory}/docs/build

  • main/waeup.sirp/trunk/setup.py

    r5328 r5495  
    77    'setuptools',
    88    'grok',
     9    'grokcore.startup',
    910    'grokui.admin',
    1011    'hurry.query',
    … …  
    8182      entry_points="""
    8283      # Add entry points here
     84      [console_scripts]
     85      sirp-debug = grokcore.startup:interactive_debug_prompt
     86      sirpctl = grokcore.startup:zdaemon_controller
     87      [paste.app_factory]
     88      main = grokcore.startup:application_factory
     89      debug = grokcore.startup:debug_application_factory
     90
    8391      """,
    8492      )
Note: See TracChangeset for help on using the changeset viewer.