Changeset 11309

Timestamp:

22 Feb 2014, 21:16:30 (11 years ago)

Author:

uli

Message:

Merge changes from henrik-diazo-themed back into trunk.

Location:

main/waeup.imostate/trunk

Files:

• . (modified) (1 prop)
• CHANGES.txt (modified) (1 diff)
• buildout-windows.cfg (deleted)
• buildout-zeo.cfg (modified) (7 diffs)
• buildout.cfg (modified) (8 diffs)
• docs/INSTALLWIN.txt (deleted)
• etc/raw (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/etc/raw)
• etc/raw/debug.ini.in (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/etc/raw/debug.ini.in)
• etc/raw/deploy.ini.in (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/etc/raw/deploy.ini.in)
• etc/themed (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/etc/themed)
• etc/themed/debug.ini.in (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/etc/themed/debug.ini.in)
• etc/themed/deploy.ini.in (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/etc/themed/deploy.ini.in)
• etc/themed/zeo1.ini.in (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/etc/themed/zeo1.ini.in)
• etc/themed/zeo2.ini.in (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/etc/themed/zeo2.ini.in)
• etc/zdaemon.conf.in (modified) (1 diff)
• etc/zeo1.conf.in (modified) (1 diff)
• etc/zeo2.conf.in (modified) (1 diff)
• etc/zope_zeo1.conf.in (modified) (2 diffs)
• etc/zope_zeo2.conf.in (modified) (2 diffs)
• layout (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/layout)
• layout/error-zope.html (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/layout/error-zope.html)
• layout/rules.xml (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/layout/rules.xml)
• layout/static (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/layout/static)
• layout/static/custom.css (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/layout/static/custom.css)
• layout/static/favicon.ico (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/layout/static/favicon.ico)
• layout/theme.html (copied) (copied from main/waeup.imostate/branches/henrik-diazo-themed/layout/theme.html)
• setup.py (modified) (4 diffs)
• src (modified) (1 prop)
• src/waeup/imostate/browser/resources.py (deleted)
• src/waeup/imostate/browser/static/custom_theme.css (deleted)
• src/waeup/imostate/browser/static/favicon.ico (deleted)
• src/waeup/imostate/browser/tests.py (modified) (1 diff)
• src/waeup/imostate/browser/theming.py (deleted)
• versions.cfg (modified) (2 diffs)

main/waeup.imostate/trunk/CHANGES.txt

@@ -2 +2 @@
 *******
 
-0.1.1 (unreleased)
-==================
+1.0dev (unreleased)
+===================
 
-* No changes yet.
-
+* Diazofied whole package.
 
 0.1 (2014-02-22)

main/waeup.imostate/trunk/buildout-zeo.cfg

@@ -13 +13 @@
     site_zcml
     zdaemon_conf
-    deploy_ini
-    debug_ini
+    raw_deploy_ini
+    raw_debug_ini
+    themed_deploy_ini
+    themed_debug_ini
     profile_ini
     zeo1_ini
@@ -23 +25 @@
 # kofactl creation must be _after_ app!
     kofactl
+    lxml
+    diazo
 # For backward compatibility, telling buildout not to throw away
 # the data and log subdirectories from the parts directory.
@@ -44 +48 @@
     address ${kofa_params:server_port}
   </zeo>
-
   <blobstorage 1>
     blob-dir ${zope_conf:blobstorage}
@@ -51 +54 @@
     </filestorage>
   </blobstorage>
-
   <filestorage async>
     path ${zope_conf:filestorage}/Data.async.fs
   </filestorage>
-
   <eventlog>
     # This sets up logging to a file.
@@ -96 +97 @@
 [zeo1_ini]
 recipe = collective.recipe.template
-input = etc/zeo1.ini.in
-output = ${buildout:parts-directory}/etc/zeo1.ini
+input = etc/themed/zeo1.ini.in
+output = ${buildout:parts-directory}/etc/themed-zeo1.ini
 
 [zeo2_ini]
 recipe = collective.recipe.template
-input = etc/zeo2.ini.in
-output = ${buildout:parts-directory}/etc/zeo2.ini
+input = etc/themed/zeo2.ini.in
+output = ${buildout:parts-directory}/etc/themed-zeo2.ini
 
 [zeo1_conf]
@@ -118 +119 @@
 # See http://pypi.python.org/pypi/zc.recipe.egg for details...
 recipe = zc.recipe.egg
-eggs = waeup.imostate [beaker]
+eggs = waeup.imostate [beaker, diazo]
 arguments = "${buildout:parts-directory}/etc/zeo1.conf"
 scripts = kofactl=zeo_client1
@@ -125 +126 @@
 # See http://pypi.python.org/pypi/zc.recipe.egg for details...
 recipe = zc.recipe.egg
-eggs = waeup.imostate [beaker]
+eggs = waeup.imostate [beaker, diazo]
 arguments = "${buildout:parts-directory}/etc/zeo2.conf"
 scripts = kofactl=zeo_client2

main/waeup.imostate/trunk/buildout.cfg

@@ -18 +18 @@
     site_zcml
     zdaemon_conf
-    deploy_ini
-    debug_ini
+    raw_deploy_ini
+    raw_debug_ini
+    themed_deploy_ini
+    themed_debug_ini
     profile_ini
     waeupdocs
@@ -26 +28 @@
 # kofactl creation must be _after_ app!
     kofactl
+    lxml
+    diazo
 # For backward compatibility, telling buildout not to throw away
 # the data and log subdirectories from the parts directory.
@@ -41 +45 @@
 
 [sources]
-waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/tags/0.2.1
-kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/tags/0.1
+waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/branches/uli-diazo-themed
+kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
 
 [kofa_params]
@@ -52 +56 @@
 zeo1_port = 7071
 zeo2_port = 7072
-zeo3_port = 7073
+# zeo3_port = 7073
 server_port = 7070
 # default 7. Number of pre-opened ZODB threads/client
@@ -62 +66 @@
 # number of preopened paster threads, default 10
 threadpool_workers = 10
+devel_pkg = waeup.imostate
 
 [app]
 # This creates all scripts in bin/. The kofactl created here is 'faulty'.
 recipe = zc.recipe.egg
-eggs = waeup.imostate [beaker]
+eggs = waeup.imostate [beaker, diazo]
        z3c.evalexception>=2.0
        Paste
@@ -80 +85 @@
 # fixed path to zdaemon.conf as argument.
 recipe = zc.recipe.egg
-eggs = waeup.imostate [beaker]
+eggs = waeup.imostate [beaker, diazo]
 arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
 scripts = kofactl=kofactl
@@ -146 +151 @@
 output = ${buildout:parts-directory}/etc/zdaemon.conf
 
-[deploy_ini]
-recipe = collective.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
-
-[debug_ini]
-recipe = collective.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+[raw_debug_ini]
+recipe = collective.recipe.template
+input = etc/raw/debug.ini.in
+output = ${buildout:parts-directory}/etc/raw-debug.ini
+
+[raw_deploy_ini]
+recipe = collective.recipe.template
+input = etc/raw/deploy.ini.in
+output = ${buildout:parts-directory}/etc/raw-deploy.ini
+
+[themed_debug_ini]
+recipe = collective.recipe.template
+input = etc/themed/debug.ini.in
+output = ${buildout:parts-directory}/etc/themed-debug.ini
+
+[themed_deploy_ini]
+recipe = collective.recipe.template
+input = etc/themed/deploy.ini.in
+output = ${buildout:parts-directory}/etc/themed-deploy.ini
 
 [profile_ini]
@@ -186 +201 @@
 scripts = coveragereport
 arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
+
+[lxml]
+recipe = z3c.recipe.staticlxml
+egg = lxml
+
+[diazo]
+recipe = zc.recipe.egg
+eggs =
+    diazo [wsgi]
+    PasteScript
+    waeup.imostate [beaker, diazo]

main/waeup.imostate/trunk/etc/zdaemon.conf.in

@@ -1 +1 @@
 <runner>
-  program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/deploy.ini
+  program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/themed-deploy.ini
   daemon on
   transcript ${zope_conf:logfiles}/zdaemon.log

main/waeup.imostate/trunk/etc/zeo1.conf.in

@@ -1 +1 @@
 <runner>
-  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/zeo1.ini
+  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo1.pid ${buildout:directory}/parts/etc/themed-zeo1.ini
   daemon on
   transcript ${zope_conf:logfiles}/zdaemon-zeo1.log
   socket-name ${zope_conf:logfiles}/zeo1.sock
   # Enable this to run the child process as a different user
-  user kofa
+  # user kofa
 </runner>

main/waeup.imostate/trunk/etc/zeo2.conf.in

@@ -1 +1 @@
 <runner>
-  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/zeo2.ini
+  program ${buildout:directory}/bin/paster serve --pid-file ${buildout:directory}/var/zeo2.pid ${buildout:directory}/parts/etc/themed-zeo2.ini
   daemon on
   transcript ${zope_conf:logfiles}/zdaemon-zeo2.log
   socket-name ${zope_conf:logfiles}/zeo2.sock
   # Enable this to run the child process as a different user
-  user kofa
+  # user kofa
 </runner>

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

@@ -24 +24 @@
 # Uncomment this if you want to connect to a ZEO server instead:
   <zeoclient>
-    server localhost:7040
+    server localhost:7070
     storage 1
     # ZEO client cache, in bytes
@@ -64 +64 @@
 <zodb async>
   <zeoclient>
-    server localhost:7040
+    server localhost:7070
     storage async
     name async

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

@@ -24 +24 @@
 # Uncomment this if you want to connect to a ZEO server instead:
   <zeoclient>
-    server localhost:7040
+    server localhost:7070
     storage 1
     # ZEO client cache, in bytes
@@ -64 +64 @@
 <zodb async>
   <zeoclient>
-    server localhost:7040
+    server localhost:7070
     storage async
     name async

main/waeup.imostate/trunk/setup.py

@@ -2 +2 @@
 from setuptools import setup, find_packages
 
-version = '0.1.1dev'
+version = '1.0dev'
 
 install_requires =[
@@ -9 +9 @@
     'grokui.admin',
     'grokcore.startup',
-    'waeup.kofa',
-    'kofacustom.nigeria',
+    'waeup.kofa >= 1.0',
+    'kofacustom.nigeria >= 1.0',
     ],
 
@@ -21 +21 @@
     'dolmen.beaker',
     ]
+
+diazo_require = [
+    'diazo',
+    'webob',
+]
 
 tests_require = [
@@ -86 +91 @@
         docs = docs_require,
         beaker = beaker_require,
+        diazo = diazo_require,
         ),
       entry_points="""
-      # Add entry points here
-      [hurry.resource.libraries]
-      waeup_custom = waeup.imostate.browser.resources:waeup_custom
       [console_scripts]
       kofa-debug = grokcore.startup:interactive_debug_prompt

main/waeup.imostate/trunk/src/waeup/imostate/browser/tests.py

@@ -49 +49 @@
         shutil.rmtree(self.dc_root)
 
-    def test_custom_theme(self):
-        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open('http://localhost/app/configuration')
-        self.assertMatches('...ImoState Theme...', self.browser.contents)
-        self.browser.getControl(name="form.skin").value = ['custom theme']
-        self.browser.getControl("Save").click()
-        self.browser.open('http://localhost/app/configuration')
-        return
-
     def test_access_live_url(self):
         # We can't access the system with basic authentication

main/waeup.imostate/trunk/versions.cfg

@@ -7 +7 @@
 
 [versions]
-waeup.kofa = 0.2.1
-kofacustom.nigeria = 0.1
 collective.recipe.sphinxbuilder = 0.7.0
 hurry.workflow = 0.11
@@ -133 +131 @@
 pycryptopp = 0.6.0.1206569328141510525648634803928199668821045408958
 
-# Added by buildout at 2014-02-22 14:45:15.540521
+# Added by buildout at 2014-02-20 10:44:36.832966
+WebOb = 1.3.1
+diazo = 1.0.5
+repoze.xmliter = 0.5
+z3c.recipe.staticlxml = 0.10
+
+# Required by:
+# diazo==1.0.5
+experimental.cssselect = 0.3
+
+# Required by:
+# diazo==1.0.5
+# experimental.cssselect==0.3
+lxml = 3.3.1
+
+# Required by:
+# z3c.recipe.staticlxml==0.10
+zc.recipe.cmmi = 1.3.5
+
+# Added by buildout at 2014-02-21 08:41:09.587051
 zc.zodbrecipes = 2.0.0