[Checkins] SVN: CMF.buildout/trunk/ CMF trunk + Zope trunk.

[Stefan H. Holek]

Log message for revision 101943:
  CMF trunk + Zope trunk.

Changed:
  U   CMF.buildout/trunk/buildout.cfg
  _U  CMF.buildout/trunk/src/

-=-
Modified: CMF.buildout/trunk/buildout.cfg
===================================================================
--- CMF.buildout/trunk/buildout.cfg	2009-07-15 22:21:18 UTC (rev 101942)
+++ CMF.buildout/trunk/buildout.cfg	2009-07-15 22:44:03 UTC (rev 101943)
@@ -1,11 +1,12 @@
-# We must use the Zope2 development egg for now.
+# CMF trunk + Zope trunk
 
 [buildout]
 extends = src/Zope2/versions.cfg
 parts =
+    zope2
+    instance
+    zopepy
     test
-    zopepy
-    instance
 eggs =
     Zope2
     Products.CMFCalendar
@@ -16,6 +17,7 @@
     Products.DCWorkflow
     Products.GenericSetup
     five.localsitemanager
+    plone.recipe.zope2instance
 develop =
     src/Zope2
     src/Products.CMFCalendar
@@ -26,11 +28,20 @@
     src/Products.DCWorkflow
     src/Products.GenericSetup
     src/five.localsitemanager
+    src/plone.recipe.zope2instance
 
-[test]
-recipe = zc.recipe.testrunner
+[zope2]
+recipe = zc.recipe.egg
+eggs = Zope2
+fake-zope-eggs = false
+
+[instance]
+recipe = plone.recipe.zope2instance
 eggs = ${buildout:eggs}
-defaults = ['--module', '^Products[.](CMF|DC|GenericSetup)|^five[.]']
+user = admin:admin
+debug-mode = on
+verbose-security = on
+http-address = 127.0.0.1:8080
 
 [zopepy]
 recipe = zc.recipe.egg
@@ -38,11 +49,8 @@
 interpreter = zopepy
 scripts = zopepy
 
-[instance]
-recipe = plone.recipe.zope2instance
+[test]
+recipe = zc.recipe.testrunner
 eggs = ${buildout:eggs}
-zope2-location = ${buildout:directory}/src/Zope2/src/Zope2
-user = admin:admin
-debug-mode = on
-verbose-security = on
-http-address = 127.0.0.1:8080
+defaults = ['--module', '^Products[.](CMF|DC|GenericSetup)|^five[.]']
+


Property changes on: CMF.buildout/trunk/src
___________________________________________________________________
Modified: svn:externals
   - Zope2 svn://svn.zope.org/repos/main/Zope/trunk
Products.CMFCalendar svn://svn.zope.org/repos/main/Products.CMFCalendar/trunk
Products.CMFCore svn://svn.zope.org/repos/main/Products.CMFCore/trunk
Products.CMFDefault svn://svn.zope.org/repos/main/Products.CMFDefault/trunk
Products.CMFTopic svn://svn.zope.org/repos/main/Products.CMFTopic/trunk
Products.CMFUid svn://svn.zope.org/repos/main/Products.CMFUid/trunk
Products.DCWorkflow svn://svn.zope.org/repos/main/Products.DCWorkflow/trunk
Products.GenericSetup svn://svn.zope.org/repos/main/Products.GenericSetup/trunk
five.localsitemanager svn://svn.zope.org/repos/main/five.localsitemanager/trunk

   + Zope2 svn://svn.zope.org/repos/main/Zope/trunk
Products.CMFCalendar svn://svn.zope.org/repos/main/Products.CMFCalendar/trunk
Products.CMFCore svn://svn.zope.org/repos/main/Products.CMFCore/trunk
Products.CMFDefault svn://svn.zope.org/repos/main/Products.CMFDefault/trunk
Products.CMFTopic svn://svn.zope.org/repos/main/Products.CMFTopic/trunk
Products.CMFUid svn://svn.zope.org/repos/main/Products.CMFUid/trunk
Products.DCWorkflow svn://svn.zope.org/repos/main/Products.DCWorkflow/trunk
Products.GenericSetup svn://svn.zope.org/repos/main/Products.GenericSetup/trunk
five.localsitemanager svn://svn.zope.org/repos/main/five.localsitemanager/trunk
plone.recipe.zope2instance https://svn.plone.org/svn/collective/buildout/plone.recipe.zope2instance/trunk