Changeset 11140

Timestamp:

20 Feb 2014, 18:54:46 (11 years ago)

Author:

Henrik Bettermann

Message:

Diazofy package

Location:

main/waeup.uniben/branches/henrik-diazo-themed

Files:

• . (modified) (1 prop)
• CHANGES.txt (modified) (1 diff)
• buildout-windows.cfg (deleted)
• buildout-zeo.cfg (modified) (4 diffs)
• buildout.cfg (modified) (7 diffs)
• docs/INSTALLWIN.txt (deleted)
• etc/raw (added)
• etc/raw/debug.ini.in (added)
• etc/raw/deploy.ini.in (added)
• etc/themed (added)
• etc/themed/debug.ini.in (added)
• etc/themed/deploy.ini.in (added)
• etc/zdaemon.conf.in (modified) (1 diff)
• layout (added)
• layout/error-zope.html (added)
• layout/rules.xml (added)
• layout/static (added)
• layout/static/custom.css (added)
• layout/static/favicon.ico (added)
• layout/theme.html (added)
• setup.py (modified) (3 diffs)
• src/waeup/uniben/browser/resources.py (deleted)
• src/waeup/uniben/browser/static/custom_theme.css (deleted)
• src/waeup/uniben/browser/static/favicon.ico (deleted)
• src/waeup/uniben/browser/tests.py (modified) (1 diff)
• src/waeup/uniben/browser/theming.py (deleted)
• versions.cfg (modified) (1 diff)

main/waeup.uniben/branches/henrik-diazo-themed

@@ -5 +5 @@
 develop-eggs
 parts
+sources
 var

@@ -5 +5 @@
 develop-eggs
 parts
+sources
 var

main/waeup.uniben/branches/henrik-diazo-themed/CHANGES.txt

@@ -1 +1 @@
 Changes
 *******
+1.0 (unreleased)
+================
+
+* Diazofied whole package.
+
 
 0.2 (unreleased)

main/waeup.uniben/branches/henrik-diazo-themed/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.
@@ -115 +119 @@
 # See http://pypi.python.org/pypi/zc.recipe.egg for details...
 recipe = zc.recipe.egg
-eggs = waeup.uniben [beaker]
+eggs = waeup.uniben [beaker, diazo]
 arguments = "${buildout:parts-directory}/etc/zeo1.conf"
 scripts = kofactl=zeo_client1
@@ -122 +126 @@
 # See http://pypi.python.org/pypi/zc.recipe.egg for details...
 recipe = zc.recipe.egg
-eggs = waeup.uniben [beaker]
+eggs = waeup.uniben [beaker, diazo]
 arguments = "${buildout:parts-directory}/etc/zeo2.conf"
 scripts = kofactl=zeo_client2

main/waeup.uniben/branches/henrik-diazo-themed/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/trunk
+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
 
@@ -62 +66 @@
 # number of preopened paster threads, default 10
 threadpool_workers = 10
+devel_pkg = waeup.uniben
 
 [app]
 # This creates all scripts in bin/. The kofactl created here is 'faulty'.
 recipe = zc.recipe.egg
-eggs = waeup.uniben [beaker]
+eggs = waeup.uniben [beaker, diazo]
        z3c.evalexception>=2.0
        Paste
@@ -80 +85 @@
 # fixed path to zdaemon.conf as argument.
 recipe = zc.recipe.egg
-eggs = waeup.uniben [beaker]
+eggs = waeup.uniben [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.uniben [beaker, diazo]

main/waeup.uniben/branches/henrik-diazo-themed/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.uniben/branches/henrik-diazo-themed/setup.py

@@ -2 +2 @@
 from setuptools import setup, find_packages
 
-version = '0.1dev'
+version = '1.0dev'
 
-install_requires = [
+install_requires =[
     'setuptools',
     'grok',
@@ -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.uniben.browser.resources:waeup_custom
       [console_scripts]
       kofa-debug = grokcore.startup:interactive_debug_prompt

main/waeup.uniben/branches/henrik-diazo-themed/src/waeup/uniben/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('...Uniben 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.uniben/branches/henrik-diazo-themed/versions.cfg

@@ -128 +128 @@
 # zc.recipe.testrunner==2.0.0
 zope.testrunner = 4.3.3
+
+# Added by buildout at 2014-02-20 19:40:23.862079
+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

@@ -5 +5 @@
 develop-eggs
 parts
+sources
 var