Changeset 11309 for main/waeup.imostate/trunk
- Timestamp:
- 22 Feb 2014, 21:16:30 (11 years ago)
- Location:
- main/waeup.imostate/trunk
- Files:
-
- 6 deleted
- 13 edited
- 15 copied
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.imostate/trunk
-
Property
svn:mergeinfo
set to
/main/waeup.imostate/branches/henrik-diazo-themed merged eligible
-
Property
svn:mergeinfo
set to
-
main/waeup.imostate/trunk/CHANGES.txt
r11241 r11309 2 2 ******* 3 3 4 0.1.1(unreleased)5 ================== 4 1.0dev (unreleased) 5 =================== 6 6 7 * No changes yet. 8 7 * Diazofied whole package. 9 8 10 9 0.1 (2014-02-22) -
main/waeup.imostate/trunk/buildout-zeo.cfg
r10371 r11309 13 13 site_zcml 14 14 zdaemon_conf 15 deploy_ini 16 debug_ini 15 raw_deploy_ini 16 raw_debug_ini 17 themed_deploy_ini 18 themed_debug_ini 17 19 profile_ini 18 20 zeo1_ini … … 23 25 # kofactl creation must be _after_ app! 24 26 kofactl 27 lxml 28 diazo 25 29 # For backward compatibility, telling buildout not to throw away 26 30 # the data and log subdirectories from the parts directory. … … 44 48 address ${kofa_params:server_port} 45 49 </zeo> 46 47 50 <blobstorage 1> 48 51 blob-dir ${zope_conf:blobstorage} … … 51 54 </filestorage> 52 55 </blobstorage> 53 54 56 <filestorage async> 55 57 path ${zope_conf:filestorage}/Data.async.fs 56 58 </filestorage> 57 58 59 <eventlog> 59 60 # This sets up logging to a file. … … 96 97 [zeo1_ini] 97 98 recipe = collective.recipe.template 98 input = etc/ zeo1.ini.in99 output = ${buildout:parts-directory}/etc/ zeo1.ini99 input = etc/themed/zeo1.ini.in 100 output = ${buildout:parts-directory}/etc/themed-zeo1.ini 100 101 101 102 [zeo2_ini] 102 103 recipe = collective.recipe.template 103 input = etc/ zeo2.ini.in104 output = ${buildout:parts-directory}/etc/ zeo2.ini104 input = etc/themed/zeo2.ini.in 105 output = ${buildout:parts-directory}/etc/themed-zeo2.ini 105 106 106 107 [zeo1_conf] … … 118 119 # See http://pypi.python.org/pypi/zc.recipe.egg for details... 119 120 recipe = zc.recipe.egg 120 eggs = waeup.imostate [beaker ]121 eggs = waeup.imostate [beaker, diazo] 121 122 arguments = "${buildout:parts-directory}/etc/zeo1.conf" 122 123 scripts = kofactl=zeo_client1 … … 125 126 # See http://pypi.python.org/pypi/zc.recipe.egg for details... 126 127 recipe = zc.recipe.egg 127 eggs = waeup.imostate [beaker ]128 eggs = waeup.imostate [beaker, diazo] 128 129 arguments = "${buildout:parts-directory}/etc/zeo2.conf" 129 130 scripts = kofactl=zeo_client2 -
main/waeup.imostate/trunk/buildout.cfg
r11231 r11309 18 18 site_zcml 19 19 zdaemon_conf 20 deploy_ini 21 debug_ini 20 raw_deploy_ini 21 raw_debug_ini 22 themed_deploy_ini 23 themed_debug_ini 22 24 profile_ini 23 25 waeupdocs … … 26 28 # kofactl creation must be _after_ app! 27 29 kofactl 30 lxml 31 diazo 28 32 # For backward compatibility, telling buildout not to throw away 29 33 # the data and log subdirectories from the parts directory. … … 41 45 42 46 [sources] 43 waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/ tags/0.2.144 kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/t ags/0.147 waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/branches/uli-diazo-themed 48 kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk 45 49 46 50 [kofa_params] … … 52 56 zeo1_port = 7071 53 57 zeo2_port = 7072 54 zeo3_port = 707358 # zeo3_port = 7073 55 59 server_port = 7070 56 60 # default 7. Number of pre-opened ZODB threads/client … … 62 66 # number of preopened paster threads, default 10 63 67 threadpool_workers = 10 68 devel_pkg = waeup.imostate 64 69 65 70 [app] 66 71 # This creates all scripts in bin/. The kofactl created here is 'faulty'. 67 72 recipe = zc.recipe.egg 68 eggs = waeup.imostate [beaker ]73 eggs = waeup.imostate [beaker, diazo] 69 74 z3c.evalexception>=2.0 70 75 Paste … … 80 85 # fixed path to zdaemon.conf as argument. 81 86 recipe = zc.recipe.egg 82 eggs = waeup.imostate [beaker ]87 eggs = waeup.imostate [beaker, diazo] 83 88 arguments = "${buildout:parts-directory}/etc/zdaemon.conf" 84 89 scripts = kofactl=kofactl … … 146 151 output = ${buildout:parts-directory}/etc/zdaemon.conf 147 152 148 [deploy_ini] 149 recipe = collective.recipe.template 150 input = etc/deploy.ini.in 151 output = ${buildout:parts-directory}/etc/deploy.ini 152 153 [debug_ini] 154 recipe = collective.recipe.template 155 input = etc/debug.ini.in 156 output = ${buildout:parts-directory}/etc/debug.ini 153 [raw_debug_ini] 154 recipe = collective.recipe.template 155 input = etc/raw/debug.ini.in 156 output = ${buildout:parts-directory}/etc/raw-debug.ini 157 158 [raw_deploy_ini] 159 recipe = collective.recipe.template 160 input = etc/raw/deploy.ini.in 161 output = ${buildout:parts-directory}/etc/raw-deploy.ini 162 163 [themed_debug_ini] 164 recipe = collective.recipe.template 165 input = etc/themed/debug.ini.in 166 output = ${buildout:parts-directory}/etc/themed-debug.ini 167 168 [themed_deploy_ini] 169 recipe = collective.recipe.template 170 input = etc/themed/deploy.ini.in 171 output = ${buildout:parts-directory}/etc/themed-deploy.ini 157 172 158 173 [profile_ini] … … 186 201 scripts = coveragereport 187 202 arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report') 203 204 [lxml] 205 recipe = z3c.recipe.staticlxml 206 egg = lxml 207 208 [diazo] 209 recipe = zc.recipe.egg 210 eggs = 211 diazo [wsgi] 212 PasteScript 213 waeup.imostate [beaker, diazo] -
main/waeup.imostate/trunk/etc/zdaemon.conf.in
r10340 r11309 1 1 <runner> 2 program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/ deploy.ini2 program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/themed-deploy.ini 3 3 daemon on 4 4 transcript ${zope_conf:logfiles}/zdaemon.log -
main/waeup.imostate/trunk/etc/zeo1.conf.in
r10340 r11309 1 1 <runner> 2 program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/ zeo1.ini2 program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/themed-zeo1.ini 3 3 daemon on 4 4 transcript ${zope_conf:logfiles}/zdaemon-zeo1.log 5 5 socket-name ${zope_conf:logfiles}/zeo1.sock 6 6 # Enable this to run the child process as a different user 7 user kofa7 # user kofa 8 8 </runner> -
main/waeup.imostate/trunk/etc/zeo2.conf.in
r10340 r11309 1 1 <runner> 2 program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/ zeo2.ini2 program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/themed-zeo2.ini 3 3 daemon on 4 4 transcript ${zope_conf:logfiles}/zdaemon-zeo2.log 5 5 socket-name ${zope_conf:logfiles}/zeo2.sock 6 6 # Enable this to run the child process as a different user 7 user kofa7 # user kofa 8 8 </runner> -
main/waeup.imostate/trunk/etc/zope_zeo1.conf.in
r10340 r11309 24 24 # Uncomment this if you want to connect to a ZEO server instead: 25 25 <zeoclient> 26 server localhost:70 4026 server localhost:7070 27 27 storage 1 28 28 # ZEO client cache, in bytes … … 64 64 <zodb async> 65 65 <zeoclient> 66 server localhost:70 4066 server localhost:7070 67 67 storage async 68 68 name async -
main/waeup.imostate/trunk/etc/zope_zeo2.conf.in
r10340 r11309 24 24 # Uncomment this if you want to connect to a ZEO server instead: 25 25 <zeoclient> 26 server localhost:70 4026 server localhost:7070 27 27 storage 1 28 28 # ZEO client cache, in bytes … … 64 64 <zodb async> 65 65 <zeoclient> 66 server localhost:70 4066 server localhost:7070 67 67 storage async 68 68 name async -
main/waeup.imostate/trunk/setup.py
r11241 r11309 2 2 from setuptools import setup, find_packages 3 3 4 version = ' 0.1.1dev'4 version = '1.0dev' 5 5 6 6 install_requires =[ … … 9 9 'grokui.admin', 10 10 'grokcore.startup', 11 'waeup.kofa ',12 'kofacustom.nigeria ',11 'waeup.kofa >= 1.0', 12 'kofacustom.nigeria >= 1.0', 13 13 ], 14 14 … … 21 21 'dolmen.beaker', 22 22 ] 23 24 diazo_require = [ 25 'diazo', 26 'webob', 27 ] 23 28 24 29 tests_require = [ … … 86 91 docs = docs_require, 87 92 beaker = beaker_require, 93 diazo = diazo_require, 88 94 ), 89 95 entry_points=""" 90 # Add entry points here91 [hurry.resource.libraries]92 waeup_custom = waeup.imostate.browser.resources:waeup_custom93 96 [console_scripts] 94 97 kofa-debug = grokcore.startup:interactive_debug_prompt -
main/waeup.imostate/trunk/src
-
Property
svn:ignore
set to
waeup.imostate.egg-info
-
Property
svn:ignore
set to
-
main/waeup.imostate/trunk/src/waeup/imostate/browser/tests.py
r10340 r11309 49 49 shutil.rmtree(self.dc_root) 50 50 51 def test_custom_theme(self):52 self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')53 self.browser.open('http://localhost/app/configuration')54 self.assertMatches('...ImoState Theme...', self.browser.contents)55 self.browser.getControl(name="form.skin").value = ['custom theme']56 self.browser.getControl("Save").click()57 self.browser.open('http://localhost/app/configuration')58 return59 60 51 def test_access_live_url(self): 61 52 # We can't access the system with basic authentication -
main/waeup.imostate/trunk/versions.cfg
r11232 r11309 7 7 8 8 [versions] 9 waeup.kofa = 0.2.110 kofacustom.nigeria = 0.111 9 collective.recipe.sphinxbuilder = 0.7.0 12 10 hurry.workflow = 0.11 … … 133 131 pycryptopp = 0.6.0.1206569328141510525648634803928199668821045408958 134 132 135 # Added by buildout at 2014-02-22 14:45:15.540521 133 # Added by buildout at 2014-02-20 10:44:36.832966 134 WebOb = 1.3.1 135 diazo = 1.0.5 136 repoze.xmliter = 0.5 137 z3c.recipe.staticlxml = 0.10 138 139 # Required by: 140 # diazo==1.0.5 141 experimental.cssselect = 0.3 142 143 # Required by: 144 # diazo==1.0.5 145 # experimental.cssselect==0.3 146 lxml = 3.3.1 147 148 # Required by: 149 # z3c.recipe.staticlxml==0.10 150 zc.recipe.cmmi = 1.3.5 151 152 # Added by buildout at 2014-02-21 08:41:09.587051 136 153 zc.zodbrecipes = 2.0.0
Note: See TracChangeset for help on using the changeset viewer.