Changeset 8896

Timestamp:

3 Jul 2012, 20:03:13 (12 years ago)

Author:

Henrik Bettermann

Message:

Merge with changes in waeup.uniben.

Location:

main/waeup.aaue/trunk

Files:

• . (modified) (1 prop)
• buildout.cfg (modified) (4 diffs)
• setup.py (modified) (1 diff)
• src/waeup/aaue (modified) (1 prop)
• src/waeup/aaue/configure.zcml (modified) (1 diff)
• src/waeup/aaue/ftesting.zcml (modified) (1 diff)
• src/waeup/aaue/overrides.zcml (deleted)
• src/waeup/aaue/widgets (deleted)

main/waeup.aaue/trunk

@@ -1 +1 @@
 bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/
-waeup.kofa https://svn.waeup.org/repos/main/waeup.kofa/trunk
-kofacustom.nigeria https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk

@@ -1 +1 @@
 bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/
-waeup.kofa https://svn.waeup.org/repos/main/waeup.kofa/trunk
-kofacustom.nigeria https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk

main/waeup.aaue/trunk/buildout.cfg

@@ -1 +1 @@
 [buildout]
-develop = . waeup.kofa kofacustom.nigeria
+# See http://pypi.python.org/pypi/mr.developer for details
+extensions = mr.developer
+auto-checkout = waeup.kofa kofacustom.nigeria
+# We cannot use 'src' (the default) as the checked out projects won't
+# work properly with paster (paster looks up any upper directory
+# egg-info dirs and then complains about not-available packages).
+sources-dir = sources
+develop = .
 parts =
     eggbasket
@@ -31 +38 @@
 # unless you specify an eggs-directory option here.
 
+[sources]
+waeup.kofa = svn https://svn.waeup.org/repos/main/waeup.kofa/trunk
+kofacustom.nigeria = svn https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk
+
 [kofa_params]
 ## Basic parameters for deployment.
@@ -36 +47 @@
 host = 0.0.0.0
 # default is 8080
-base_port = 7021
-zeo1_port = 7021
-zeo2_port = 7022
-zeo3_port = 7023
-server_port = 7020
+base_port = 7011
+zeo1_port = 7011
+zeo2_port = 7012
+zeo3_port = 7013
+server_port = 7010
 # default 7. Number of pre-opened ZODB threads/client
 pool_size = 7
@@ -60 +71 @@
        repoze.profile
        ZODB3
+interpreter = python-console
 
 [kofactl]

main/waeup.aaue/trunk/setup.py

@@ -9 +9 @@
     'grokui.admin',
     'grokcore.startup',
-    'waeup.kofa', # not really neccessary, as kofacustom.ng includes it
+    'waeup.kofa',
     'kofacustom.nigeria',
     ],

main/waeup.aaue/trunk/src/waeup/aaue/configure.zcml

@@ -1 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:grok="http://namespaces.zope.org/grok">
+  <include package="waeup.aaue" file="locales.zcml" />
 
-  <include package="waeup.aaue" file="locales.zcml" />
-  <include package="grok" />
-  <includeOverrides package="waeup.aaue" file="overrides.zcml" />
+  <!-- kofacustom.nigeria configures everything we basically need.
+  -->
+  <include package="kofacustom.nigeria" />
+
+  <grok:grok package="." />
 
 </configure>

main/waeup.aaue/trunk/src/waeup/aaue/ftesting.zcml

@@ -6 +6 @@
    >
 
-  <include package="grok" />
-  <includeOverrides package="waeup.aaue" />
-  <includeOverrides package="waeup.aaue" file="mail.zcml"/>
+  <include package="waeup.aaue" />
+  <include package="waeup.aaue" file="mail.zcml"/>
 
   <!-- Where should the datacenter reside by default? -->

@@ -1 +1 @@
 bootstrap svn://svn.zope.org/repos/main/zc.buildout/trunk/bootstrap/
-waeup.kofa https://svn.waeup.org/repos/main/waeup.kofa/trunk
-kofacustom.nigeria https://svn.waeup.org/repos/main/kofacustom.nigeria/trunk