[Checkins] SVN: www.zope.org/trunk/ - collapse 3 small buildout configurations into one file for clarity

[Jens Vagelpohl]

Log message for revision 90052:
  - collapse 3 small buildout configurations into one file for clarity
  - remove supervisor, it doesn't add anything in this situation apart from
    one more wheel to mind
  

Changed:
  D   www.zope.org/trunk/base.cfg
  U   www.zope.org/trunk/buildout.cfg
  D   www.zope.org/trunk/versions.cfg

-=-
Deleted: www.zope.org/trunk/base.cfg
===================================================================
--- www.zope.org/trunk/base.cfg	2008-08-21 08:48:36 UTC (rev 90051)
+++ www.zope.org/trunk/base.cfg	2008-08-21 09:33:06 UTC (rev 90052)
@@ -1,43 +0,0 @@
-[buildout]
-find-links =
-    http://dist.plone.org
-    http://download.zope.org/ppix/
-    http://effbot.org/downloads
-eggs =
-    elementtree
-develop =
-
-[plone]
-recipe = plone.recipe.plone
-
-[zope2]
-recipe = plone.recipe.zope2install
-url = ${plone:zope2-url}
-ersion-suffix-packages =
-
-[zeo]
-recipe = plone.recipe.zope2zeoserver
-zope2-location = ${zope2:location}
-zeo-address = 127.0.0.1:8100
-
-[instance]
-recipe = plone.recipe.zope2instance
-zope2-location = ${zope2:location}
-debug-mode = off
-verbose-security = off
-zeo-client = True
-zeo-address = ${zeo:zeo-address}
-user = admin:admin
-http-address = 127.0.0.1:8080
-eggs =
-    ${buildout:eggs}
-    ${plone:eggs}
-zcml =
-products =
-    ${buildout:directory}/products
-    ${productdistros:location}
-    ${plone:products}
-
-[supervisor]
-recipe = zc.recipe.egg
-eggs = supervisor

Modified: www.zope.org/trunk/buildout.cfg
===================================================================
--- www.zope.org/trunk/buildout.cfg	2008-08-21 08:48:36 UTC (rev 90051)
+++ www.zope.org/trunk/buildout.cfg	2008-08-21 09:33:06 UTC (rev 90052)
@@ -3,30 +3,61 @@
 # see http://plone.org/documentation/tutorial/buildout
 
 [buildout]
-extends =
-    versions.cfg
-    base.cfg
+find-links =
+    http://dist.plone.org
+    http://download.zope.org/ppix/
+    http://effbot.org/downloads
 versions = versions
 parts =
     plone
     zope2
-    productdistros
-    zeo
+    zeoserver
     instance
-    supervisor
 eggs =
+    elementtree
+    PILwoTK
 develop =
     src/zopeorg.deployment
     src/zopeorg.theme
 
-[instance]
+[versions]
+plone.recipe.plone = 3.1.2
+plone.recipe.zope2instance = 2.0
+Products.PloneFormGen = 1.2.3
+
+[plone]
+recipe = plone.recipe.plone
+
+[zope2]
+recipe = plone.recipe.zope2install
+url = ${plone:zope2-url}
+ersion-suffix-packages =
+
+[zeoserver]
+recipe = plone.recipe.zope2zeoserver
+zope2-location = ${zope2:location}
+zeo-address = ${buildout:location}/var/zeo.soc
+
+[instance1]
+recipe = plone.recipe.zope2instance
+zope2-location = ${zope2:location}
+debug-mode = off
+verbose-security = off
+zeo-client = True
+zeo-address = ${zeoserver:zeo-address}
+user = admin:admin
+http-address = 127.0.0.1:8080
 eggs =
     ${buildout:eggs}
     ${plone:eggs}
     zopeorg.deployment
 zcml =
     zopeorg.deployment
+products =
+    ${buildout:directory}/products
+    ${plone:products}
 zope-conf-additional =
     <environment>
        DISABLE_PTS true
     </environment>
+

Deleted: www.zope.org/trunk/versions.cfg
===================================================================
--- www.zope.org/trunk/versions.cfg	2008-08-21 08:48:36 UTC (rev 90051)
+++ www.zope.org/trunk/versions.cfg	2008-08-21 09:33:06 UTC (rev 90052)
@@ -1,10 +0,0 @@
-[versions]
-plone.recipe.plone = 3.1.2
-plone.recipe.zope2instance = 2.0
-Products.PloneFormGen = 1.2.3
-supervisor = 3.0a6
-
-[productdistros]
-recipe = plone.recipe.distros
-urls =
-nested-packages =