Unify cloudooo stack and erp5 stack way to install cloudooo.

Unify the way to setup cloudooo by downloading from git directly.

component/cloudooo/buildout.cfg

@@ -5,31 +5,43 @@ extends =
 parts =
   cloudooo
 
-sources = sources
+develop +=
+  ${:parts-directory}/cloudooo
 
-[sources]
-# Include information related to official cloudooo source code.
-cloudooo = git http://git.erp5.org/repos/cloudooo.git
+[cloudooo-check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
 
-[lxml-python]
-python = python2.6
+[cloudooo-repository]
+recipe = plone.recipe.command
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+stop-on-error = true
+repository = http://git.erp5.org/repos/cloudooo.git
+branch = master
+revision =
+command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
 
 [cloudooo]
 recipe = zc.recipe.egg
 python = python2.6
+extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
-  cloudooo
-  cloudooo.handler.ooo
-  cloudooo.handler.pdf
-  cloudooo.handler.ffmpeg
-  cloudooo.handler.imagemagick
   PasteScript
   python-magic
+  psutil
+  WSGIUtils
+  cloudooo
 entry-points =
+  main=cloudooo.paster_application:application
   cloudooo_tester=cloudooo.bin.cloudooo_tester:main
   runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
-
+  runCloudoooTestSuite=cloudooo.tests.runTestSuite:run
 scripts = 
   paster=cloudooo_paster
   runCloudoooUnitTest
+  runCloudoooTestSuite
+ugly-depend-on = ${cloudooo-repository:command} ${cloudooo-repository:update-command} ${cloudooo-check-recipe:command}

component/cloudooo/buildout.eggversion.cfg

+[buildout]
+extends =
+  ../lxml-python/buildout.cfg
+
+parts =
+  cloudooo
+
+[lxml-python]
+python = python2.6
+
+[cloudooo]
+recipe = zc.recipe.egg
+python = python2.6
+eggs =
+  ${lxml-python:egg}
+  cloudooo
+  cloudooo.handler.ooo
+  cloudooo.handler.pdf
+  cloudooo.handler.ffmpeg
+  cloudooo.handler.imagemagick
+  PasteScript
+  python-magic
+entry-points =
+  cloudooo_tester=cloudooo.bin.cloudooo_tester:main
+  runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
+
+scripts =
+  paster=cloudooo_paster
+  runCloudoooUnitTest
+
+

stack/cloudooo.cfg

@@ -29,6 +29,7 @@ extends =
   ../component/rdiff-backup/buildout.cfg
   ../component/dcron/buildout.cfg
   ../component/coreutils/buildout.cfg
+  ../component/cloudooo/buildout.cfg
  
 versions = versions
 
@@ -60,51 +61,11 @@ parts =
   bootstrap2.6
   rdiff-backup
   cloudooo
-  cloudooo-check-recipe
-  instance-recipe-egg
 
 # Local development
 develop +=
   ${:parts-directory}/cloudooo
 
-[cloudooo-check-recipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/cloudooo.egg-link
-
-[cloudooo]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-repository = http://git.erp5.org/repos/cloudooo.git
-branch = master
-revision =
-command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
-
-[instance-recipe-egg]
-recipe = zc.recipe.egg
-python = python2.6
-extra-paths = ${cloudooo:location}
-eggs =
-  ${lxml-python:egg}
-  PasteScript
-  python-magic
-  psutil
-  WSGIUtils
-  cloudooo
-entry-points =
-  main=cloudooo.paster_application:application
-  cloudooo_tester=cloudooo.bin.cloudooo_tester:main
-  runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run
-  runCloudoooTestSuite=cloudooo.tests.runTestSuite:run
-scripts = 
-  paster=cloudooo_paster
-  runCloudoooUnitTest
-  runCloudoooTestSuite
-ugly-depend-on = ${cloudooo:command} ${cloudooo:update-command}
-
 [bootstrap2.6]
 python = python2.6
 

stack/erp5.cfg

@@ -81,6 +81,7 @@ extends =
   ../component/dash/buildout.cfg
   ../component/wget/buildout.cfg
   ../component/aspell/buildout.cfg
+  ../component/cloudooo/buildout.cfg
 
 versions = versions
 
@@ -431,20 +432,6 @@ scripts =
   onetimedownload
   zodbpack
 
-[cloudooo]
-recipe = zc.recipe.egg
-python = python2.6
-eggs =
-  ${lxml-python:egg}
-  cloudooo.handler.ffmpeg
-  cloudooo.handler.imagemagick
-  cloudooo.handler.ooo
-  cloudooo.handler.pdf
-  cloudooo
-  PasteScript
-scripts =
-  paster=cloudooo_paster
-
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-005