Changeset 7713


Ignore:
Timestamp:
28 Feb 2012, 10:14:55 (13 years ago)
Author:
uli
Message:

Some modifications that make it possible at least to create a new university with Grok toolkit 1.4 (grok 1.6)

Location:
main/waeup.sirp/branches/ulif-groktoolkit-1.4
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.sirp/branches/ulif-groktoolkit-1.4/buildout.cfg

    r7583 r7713  
    11[buildout]
    22develop = .
     3#     #eggbasket
    34parts =
    4     eggbasket
    55    app
    66    i18n
    … …  
    1717    coverage-detect
    1818    coverage-report
     19    interactive_debugger
    1920# sirpctl creation must be _after_ app!
    2021    sirpctl
    … …  
    2627
    2728#extends = versions.cfg
    28 extends= http://grok.zope.org/releaseinfo/grok-1.1.cfg
     29extends= http://grok.zope.org/releaseinfo/1.4.1/versions.cfg
     30#extends= http://grok.zope.org/releaseinfo/grok-1.4/versions.cfg
    2931# eggs will be installed in the default buildout location
    3032# (see .buildout/default.cfg in your home directory)
    … …  
    3436
    3537[versions]
     38fanstatic = 0.11.4
    3639collective.recipe.sphinxbuilder = 0.7.0
    3740hurry.workflow = 0.11
    3841# Pinned to circumvent breakage in 0.4.x
    3942hurry.zoperesource = 0.6
     43zope.fanstatic =
    4044# Pinned to prevent buildout svn-error.
    4145lovely.recipe = 1.0.0
    42 megrok.layout = 1.0.2
     46#megrok.layout = 1.0.2
    4347reportlab = 2.5
    4448transaction = 1.1.0
    4549z3c.testsetup = 0.6.1
    46 zc.buildout = 1.5.0
     50#zc.buildout = 1.5.0
    4751zc.recipe.egg = 1.3.0
    4852zc.recipe.testrunner = 1.4.0
    49 zope.app.testing = 3.8.1
     53#zope.app.testing = 3.8.1
    5054# for support of @provider directive
    51 zope.interface = 3.6.3
     55#zope.interface = 3.6.3
    5256# for support of contextual default values
    5357zope.schema = 3.8.0
    54 zope.testing = 3.10.2
    55 zope.xmlpickle = 3.4.0
     58#zope.testing = 3.10.2
     59#zope.xmlpickle = 3.4.0
    5660# Require latest version...
    5761Sphinx = 1.0.7
    … …  
    188192scripts = coveragereport
    189193arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
     194
     195[interactive_debugger]
     196recipe = z3c.recipe.scripts
     197eggs = waeup.sirp
     198entry-points =
     199  interactive_debugger=grokcore.startup.startup:interactive_debug_prompt
     200arguments = zope_conf="${zope_conf:output}"

  • main/waeup.sirp/branches/ulif-groktoolkit-1.4/etc/debug.ini.in

    r5677 r7713  
    1 # debug.ini
    2 #
    3 # Debugging configuration for use with paster/WSGI
    4 #
    5 
    6 [loggers]
    7 keys = root, wsgi
    8 
    9 [handlers]
    10 keys = console, accesslog
    11 
    12 [formatters]
    13 keys = generic, accesslog
    14 
    15 [formatter_generic]
    16 format = %(asctime)s %(levelname)s [%(name)s] %(message)s
    17 
    18 [formatter_accesslog]
    19 format = %(message)s
    20 
    21 [handler_console]
    22 class = StreamHandler
    23 args = (sys.stderr,)
    24 level = NOTSET
    25 formatter = generic
    26 
    27 [handler_accesslog]
    28 class = FileHandler
    29 args = (os.path.join(r'${zope_conf:logfiles}', 'access.log'),
    30         'a')
    31 level = INFO
    32 formatter = accesslog
    33 
    34 [logger_root]
    35 level = INFO
    36 handlers = console
    37 
    38 [logger_wsgi]
    39 level = INFO
    40 handlers = accesslog
    41 qualname = wsgi
    42 propagate = 0
    43 
    44 [filter:translogger]
    45 use = egg:Paste#translogger
    46 setup_console_handler = False
    47 logger_name = wsgi
    48 
    49 [filter-app:main]
    50 # Change the last part from 'ajax' to 'pdb' for a post-mortem debugger
    51 # on the console:
    52 use = egg:z3c.evalexception#ajax
    53 next = zope
    54 
    55 [app:zope]
    56 use = egg:waeup.sirp#debug
    57 filter-with = translogger
    58 exempt-exceptions = zope.security.interfaces.IUnauthorized
     1[DEFAULT]
     2zope_conf = %(here)s/zope.conf
    593
    604[server:main]
    … …  
    637port = 8080
    648
    65 [DEFAULT]
    66 # set the name of the zope.conf file
    67 zope_conf = %(here)s/zope.conf
     9[pipeline:main]
     10pipeline = accesslogging evalexception fanstatic grok
     11
     12[filter:accesslogging]
     13use = egg:Paste#translogger
     14
     15[filter:evalexception]
     16use = egg:z3c.evalexception#ajax
     17
     18[filter:fanstatic]
     19use = egg:fanstatic#fanstatic
     20versioning = true
     21recompute_hashes = true
     22
     23[app:grok]
     24use = egg:grokcore.startup#debug
     25exempt-exceptions = zope.security.interfaces.IUnauthorized
     26
     27# Logging configuration
     28
     29[loggers]
     30keys = root
     31
     32[logger_root]
     33level = DEBUG
     34handlers = console
     35
     36[handlers]
     37keys = console
     38
     39[handler_console]
     40class = StreamHandler
     41args = (sys.stderr,)
     42level = DEBUG
     43formatter = generic
     44
     45[formatters]
     46keys = generic
     47
     48[formatter_generic]
     49format = %(asctime)s %(levelname)s [%(name)s] %(message)s

  • main/waeup.sirp/branches/ulif-groktoolkit-1.4/etc/deploy.ini.in

    r5677 r7713  
    5555host = 0.0.0.0
    5656port = 8080
     57threadpool_workers = 50
     58use_threadpool = True
    5759
    5860[DEFAULT]

  • main/waeup.sirp/branches/ulif-groktoolkit-1.4/etc/site.zcml.in

    r7577 r7713  
    3030      <!-- Replace the following directive if you do not want
    3131           public access -->
    32       <grant permission="zope.app.dublincore.view"
    33              principal="zope.Anybody" />
     32      <!-- grant permission="zope.app.dublincore.view"
     33             principal="zope.Anybody" / -->
    3434      <grant permission="zope.View"
    3535             principal="zope.Authenticated" />
    36       <grant permission="zope.app.dublincore.view"
    37              principal="zope.Authenticated" />
     36      <!-- grant permission="zope.app.dublincore.view"
     37             principal="zope.Authenticated" / -->
    3838      <grant permission="waeup.Public"
    3939             principal="zope.Everybody" />

  • main/waeup.sirp/branches/ulif-groktoolkit-1.4/etc/zope.conf.in

    r5495 r7713  
    33
    44<zodb>
     5
     6  #cache-size
     7
     8  # num of concurrent pre-opened ZODB threads; default: 7
     9  pool-size 50
     10
    511  # Standard blob storage
    612  <blobstorage>
    … …  
    2531#    #client zeo1
    2632#  </zeoclient>
     33
     34# Uncomment this if you want to run a ZEO server instead:
     35#  <zeo>
     36#    # required; 'host:port' for TCP/IP, path to a socket file for UDP
     37#    address localhost:8090
     38#
     39#    # optional; 'address' remarks apply
     40#    #monitor-address localhost:8091
     41#
     42#    # optional; keep queue of last N transactions. Speeds up client cache verif.
     43#    #invalidation-queue-size 10
     44#
     45#    # optional; is this a read-only instance? true or false
     46#    #read-only false
     47#
     48#    # optional; seconds to wait for client to commit after acquiring lock
     49#    #transaction-timeout 20
     50#
     51#    # optional; authentication protocol. With ZEO only 'digest' supported
     52#    #authentication-protocol digest
     53#
     54#    # optional; Path of the database containing authentication credentials.
     55#    #authentication-database
     56#
     57#    # optional; the authentication realm of server
     58#    #authentication-realm myrealm
     59#  </zeo>
    2760
    2861</zodb>

  • main/waeup.sirp/branches/ulif-groktoolkit-1.4/setup.py

    r7666 r7713  
    1414    'hurry.jqueryui',
    1515    'hurry.workflow >= 0.11',
     16    'fanstatic',
     17    #'zope.fanstatic',
     18    'js.jquery_datatables',
    1619    # Add extra requirements here
    1720    'docutils', # For RST-processing...
    … …  
    2427    'reportlab',
    2528    'PIL',
    26     'zope.app.authentication', # BBB: During switch to grok 1.1
    27     'zope.app.file',
    28     'zope.app.testing',        # XXX: test_permissions needs this
    29     'zope.app.undo',
    30     'zope.file',
     29    #'zope.app.authentication', # BBB: During switch to grok 1.1
     30    'zope.authentication',
     31    'zope.pluggableauth',
     32    'zope.principalannotation',
     33    #'zope.app.file',
     34    #'zope.app.testing',        # XXX: test_permissions needs this
     35    #'zope.app.undo',
     36    #'zope.app.zcmlfiles',
     37    #'zope.app.wsgi',
     38    #'zope.app.appsetup',
     39    #'zope.file',
     40    'zope.app.schema',         # XXX: for registering named vocabs
    3141    'zope.interface >= 3.6.0',
    3242    'zope.testbrowser',        # XXX: test_permissions needs this
    … …  
    122132      main = grokcore.startup:application_factory
    123133      debug = grokcore.startup:debug_application_factory
     134      [fanstatic.libraries]
     135      waeup.sirp = waeup.sirp.browser.resources:waeup_kofa
    124136
    125137      """,

  • main/waeup.sirp/branches/ulif-groktoolkit-1.4/src/waeup/sirp/browser/resources.py

    r7592 r7713  
    197197#: use of datatables you might want to add some specialized CSS like
    198198#: `datatable_css` below.
    199 datatables = ResourceInclusion(waeup_sirp, 'jquery.dataTables.js',
    200                                minified='jquery.dataTables.min.js',
    201                                depends=[jquery])
     199from js.jquery_datatables import jquery_datatables as datatables
     200from fanstatic import Library, Resource
     201waeup_kofa = Library('waeup_kofa', 'static')
     202#datatables = ResourceInclusion(waeup_sirp, 'jquery.dataTables.js',
     203#                               minified='jquery.dataTables.min.js',
     204#                               depends=[jquery])
    202205
    203206#: A stylesheet for datatables
    204 datatables_css = ResourceInclusion(waeup_sirp, 'datatables.css')
     207#datatables_css = ResourceInclusion(waeup_sirp, 'datatables.css')
     208datatables_css = Resource(waeup_kofa, 'datatables.css')
    205209
    206210#: A resource that turns HTML tables into sortable, searchable and :
    … …  
    251255#: for details.
    252256#:
    253 datatable = ResourceInclusion(waeup_sirp, 'datatable.js',
    254                               depends=[datatables, datatables_css])
     257#datatable = ResourceInclusion(waeup_sirp, 'datatable.js',
     258#                              depends=[datatables, datatables_css])
     259datatable = Resource(waeup_kofa, 'datatable.js',
     260                     depends=[datatables, datatables_css])
    255261
    256262#: Register Twitter's Bootsrap css including dropdown js as a resource.
Note: See TracChangeset for help on using the changeset viewer.