Changeset 11090

Timestamp:

13 Feb 2014, 07:54:48 (11 years ago)

Author:

Henrik Bettermann

Message:

Diazofy kofacustom.nigeria.

Location:

main

Files:

• kofacustom.nigeria/branches/henrik-diazo-themed/buildout.cfg (modified) (8 diffs)
• kofacustom.nigeria/branches/henrik-diazo-themed/setup.py (modified) (2 diffs)
• kofacustom.nigeria/branches/henrik-diazo-themed/src/kofacustom/nigeria/students/tests/test_browser.py (modified) (1 diff)
• kofacustom.nigeria/branches/henrik-diazo-themed/versions.cfg (modified) (1 diff)
• waeup.kofa/trunk/etc/raw (added)
• waeup.kofa/trunk/etc/raw/debug.ini.in (added)
• waeup.kofa/trunk/etc/raw/deploy.ini.in (added)
• waeup.kofa/trunk/etc/themed (added)
• waeup.kofa/trunk/etc/themed/debug.ini.in (added)
• waeup.kofa/trunk/etc/themed/deploy.ini.in (added)
• waeup.kofa/trunk/etc/zdaemon.conf.in (modified) (1 diff)

main/kofacustom.nigeria/branches/henrik-diazo-themed/buildout.cfg

@@ -16 +16 @@
     site_zcml
     zdaemon_conf
-    deploy_ini
-    debug_ini
+    raw_deploy_ini
+    raw_debug_ini
+    themed_deploy_ini
+    themed_debug_ini
     profile_ini
 # waeupdocs
@@ -24 +26 @@
 # 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.
@@ -34 +38 @@
 update-versions-file = versions.cfg
 
+
 # eggs will be installed in the default buildout location
 # (see .buildout/default.cfg in your home directory)
@@ -39 +44 @@
 
 [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
 [kofa_params]
 ## Basic parameters for deployment.
@@ -64 +68 @@
 # This creates all scripts in bin/. The kofactl created here is 'faulty'.
 recipe = zc.recipe.egg
-eggs = kofacustom.nigeria [beaker]
+eggs = kofacustom.nigeria [beaker, diazo]
        z3c.evalexception>=2.0
        Paste
@@ -78 +82 @@
 # fixed path to zdaemon.conf as argument.
 recipe = zc.recipe.egg
-eggs = kofacustom.nigeria [beaker]
+eggs = kofacustom.nigeria [beaker, diazo]
        waeup.kofa
 arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
@@ -151 +155 @@
 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]
@@ -191 +205 @@
 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
+    kofacustom.nigeria [beaker,diazo]

main/kofacustom.nigeria/branches/henrik-diazo-themed/setup.py

@@ -33 +33 @@
     'roman',
     'repoze.sphinx.autointerface',
+    ]
+
+diazo_require = [
+    'diazo',
+    'webob',
     ]
 
@@ -81 +86 @@
         docs = docs_require,
         beaker = beaker_require,
+        diazo = diazo_require,
         ),
       entry_points="""

main/kofacustom.nigeria/branches/henrik-diazo-themed/src/kofacustom/nigeria/students/tests/test_browser.py

@@ -287 +287 @@
             name='upload_acceptanceletterupload').click()
         self.assertTrue(
-            '<a target="image" href="acc_let">'
+            'http://localhost/app/students/K1000000/acc_let'
             in self.browser.contents)
         self.browser.getControl(

main/kofacustom.nigeria/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-13 08:26:53.898100
+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

main/waeup.kofa/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