Merge branch 'master' into erp5testnode

00.Repository.Rules.txt

+SlapOS repository rules
+=======================
+
+Short version for impatient
+---------------------------
+
+'master' branch is always stable. One shall never work in this branch. One
+shall expect reversion or removal of his commits in 'master' branch, if they
+are not because of merging another branch.
+
+Everyone has to create branch, basing on 'master' or any other branch. All
+work shall be done in such branch. It is advised to review it before merging
+into 'master'. It is very good habit to tag such merges.
+
+A bit more background
+---------------------
+
+SlapOS repository 'master' branch is supposed to be stable. No new work is
+accepted on this branch. Each time someone uses (clones, extends) 'master'
+branch it is supposed to work (as far as it was tested).
+
+Tags on 'master' branch are supposed to be repeatable software definitions
+forever. All versions and external links shall be setup in a way, that they
+wouldn't change in day, month, year, etc.
+
+Everyone can make his own branch to introduce new software to SlapOS. There
+are no rules about those branches, as each software is specific.
+
+It is good idea to ask for review before merging changes into 'master' branch.
+Peer review can detect issues not detected by testing, development or self
+analysis.
+
+After some software is stabilised and no more work is planned it is acceptable
+to remove such abandoned branch in order to minimise amount of branches.

component/cloudooo-development/buildout.cfg

-[buildout]
-
-extends =
-  ../cloudooo/buildout.cfg
-
-extensions = mr.developer
-sources = sources
-auto-checkout = ${buildout:cloudooo-packages}
-
-[sources]
-cloudooo = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo
-cloudooo.handler.pdf = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo.handler.pdf/
-cloudooo.handler.ffmpeg = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo.handler.ffmpeg/
-cloudooo.handler.imagemagick = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo.handler.imagemagick/
-cloudooo.handler.ooo = svn https://svn.erp5.org/repos/public/erp5/trunk/utils/cloudooo.handler.ooo/

component/glib/buildout.cfg

@@ -5,8 +5,8 @@ extends =
 
 [glib]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.6.tar.bz2
-md5sum = 7d8fc15ae70d5111c0cf2a79d50ef717
+url = http://ftp.gnome.org/pub/gnome/sources/glib/2.28/glib-2.28.7.tar.bz2
+md5sum = feda1650c8646ad39c7b01d95b03766b
 configure-options =
   --disable-static
   --disable-selinux

component/mysql-5.1/buildout.cfg

@@ -21,9 +21,9 @@ download-only = true
 
 [mysql-5.1]
 recipe = hexagonit.recipe.cmmi
-version = 5.1.54
+version = 5.1.57
 url = http://mysql.he.net/Downloads/MySQL-5.1/mysql-${:version}.tar.gz
-md5sum = 2a0f45a2f8b5a043b95ce7575796a30b
+md5sum = 8d6998ef0f2e2d1dac2a761348c71c21
 # compile directory is required to build mysql plugins.
 keep-compile-dir = true
 # configure: how to avoid searching for my.cnf?

component/slapos/buildout.cfg

+[buildout]
+extends =
+  ../lxml-python/buildout.cfg
+  ../python-2.7/buildout.cfg
+
+parts =
+  slapos
+
+find-links =
+  http://www.nexedi.org/static/packages/source/slapos.buildout/
+
+versions = versions
+
+[lxml-python]
+python = python2.7
+
+[slapos]
+recipe = z3c.recipe.scripts
+python = python2.7
+eggs =
+  ${lxml-python:egg}
+  slapos.core
+
+[versions]
+zc.buildout = 1.5.3-dev-SlapOS-001
+Jinja2 = 2.5.5
+Werkzeug = 0.6.2
+hexagonit.recipe.cmmi = 1.5.0
+lxml = 2.3
+meld3 = 0.6.7
+setuptools = 0.6c12dev-r88795
+slapos.core = 0.2
+xml-marshaller = 0.9.7
+z3c.recipe.scripts = 1.0.1
+zc.recipe.egg = 1.3.2
+
+# Required by:
+# slapos.core==0.2
+Flask = 0.6.1
+
+# Required by:
+# hexagonit.recipe.cmmi==1.5.0
+hexagonit.recipe.download = 1.5.0
+
+# Required by:
+# slapos.core==0.2
+netaddr = 0.7.5
+
+# Required by:
+# slapos.core==0.2
+netifaces = 0.5
+
+# Required by:
+# slapos.core==0.2
+supervisor = 3.0a10
+
+# Required by:
+# slapos.core==0.2
+zope.interface = 3.6.3
+

component/subversion/buildout.cfg

@@ -24,8 +24,8 @@ md5sum = 8d911ec2422dc4c08a00693ac915a07a
 
 [subversion]
 recipe = hexagonit.recipe.cmmi
-url = http://subversion.tigris.org/downloads/subversion-1.6.16.tar.bz2
-md5sum = 32f25a6724559fe8691d1f57a63f636e
+url = http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2
+md5sum = 81e5dc5beee4b3fc025ac70c0b6caa14
 patches =
   ${subversion-1.6.0-disable_linking_against_unneeded_libraries:location}/${subversion-1.6.0-disable_linking_against_unneeded_libraries:filename}
 configure-options =

slapos/recipe/README.cloudooo.txt

+cloudooo
+=========
+
+Instantiates CloudOOo instance.

slapos/recipe/cloudooo/__init__.py

+##############################################################################
+#
+# Copyright (c) 2010 Vifib SARL and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+import os
+import pkg_resources
+import sys
+import zc.buildout
+import zc.recipe.egg
+
+class Recipe(BaseSlapRecipe):
+  def getTemplateFilename(self, template_name):
+    return pkg_resources.resource_filename(__name__,
+        'template/%s' % template_name)
+
+  def _install(self):
+    self.path_list = []
+    self.requirements, self.ws = self.egg.working_set([__name__])
+    # Use killpidfromfile from ERP5.
+    self.killpidfromfile = zc.buildout.easy_install.scripts(
+        [('killpidfromfile', __name__ + 'slapos.recipe.erp5.killpidfromfile',
+          'killpidfromfile')], self.ws, sys.executable, self.bin_directory)[0]
+    self.path_list.append(self.killpidfromfile)
+    conversion_server_conf = self.installConversionServer(
+        self.getLocalIPv4Address(), 23000, 23060)
+
+    self.linkBinary()
+    self.setConnectionDict(dict(
+      site_url="http://%s:%s/" % (self.getLocalIPv4Address(), 23000),
+    ))
+    return self.path_list
+
+  def linkBinary(self):
+    """Links binaries to instance's bin directory for easier exposal"""
+    for linkline in self.options.get('link_binary_list', '').splitlines():
+      if not linkline:
+        continue
+      target = linkline.split()
+      if len(target) == 1:
+        target = target[0]
+        path, linkname = os.path.split(target)
+      else:
+        linkname = target[1]
+        target = target[0]
+      link = os.path.join(self.bin_directory, linkname)
+      if os.path.lexists(link):
+        if not os.path.islink(link):
+          raise zc.buildout.UserError(
+              'Target link already %r exists but it is not link' % link)
+        os.unlink(link)
+      os.symlink(target, link)
+      self.logger.debug('Created link %r -> %r' % (link, target))
+      self.path_list.append(link)
+
+  def installConversionServer(self, ip, port, openoffice_port):
+    name = 'conversion_server'
+    working_directory = self.createDataDirectory(name)
+    conversion_server_dict = dict(
+      working_path=working_directory,
+      uno_path=self.options['ooo_uno_path'],
+      office_binary_path=self.options['ooo_binary_path'],
+      ip=ip,
+      port=port,
+      openoffice_port=openoffice_port,
+    )
+    for env_line in self.options['environment'].splitlines():
+      env_line = env_line.strip()
+      if not env_line:
+        continue
+      if '=' in env_line:
+        env_key, env_value = env_line.split('=')
+        conversion_server_dict[env_key.strip()] = env_value.strip()
+      else:
+        raise zc.buildout.UserError('Line %r in environment parameter is '
+            'incorrect' % env_line)
+    config_file = self.createConfigurationFile(name + '.cfg',
+        self.substituteTemplate(self.getTemplateFilename('cloudooo.cfg.in'),
+          conversion_server_dict))
+    self.path_list.append(config_file)
+    # Use execute from erp5.
+    self.path_list.extend(zc.buildout.easy_install.scripts([(name,
+      __name__ + 'slapos.recipe.erp5.execute',
+      'execute_with_signal_translation')], self.ws,
+      sys.executable, self.wrapper_directory,
+      arguments=[self.options['ooo_paster'].strip(), 'serve', config_file]))
+    return {
+      name + '_port': conversion_server_dict['port'],
+      name + '_ip': conversion_server_dict['ip']
+      }

slapos/recipe/cloudooo/template/cloudooo.cfg.in

+[app:main]
+use = egg:cloudooo
+#
+## System config
+#
+debug_mode = True
+# Folder where pid files, lock files and virtual frame buffer mappings
+# are stored. In this folder is necessary create a folder tmp, because this
+# folder is used to create all temporary documents.
+working_path = %(working_path)s
+# Folder where UNO library is installed
+uno_path = %(uno_path)s
+# Folder where soffice.bin is installed
+office_binary_path = %(office_binary_path)s
+#
+## Monitor Settings
+#
+# Limit to use the Openoffice Instance. if pass of the limit, the instance is
+# stopped and another is started.
+limit_number_request = 100
+# Interval to check the factory
+monitor_interval = 10
+timeout_response = 180
+enable_memory_monitor = True
+# Set the limit in MB
+# e.g 1000 = 1 GB, 100 = 100 MB
+limit_memory_used = 3000
+#
+## OOFactory Settings
+#
+# The pool consist of several OpenOffice.org instances
+application_hostname = %(ip)s
+# OpenOffice Port
+openoffice_port = %(openoffice_port)s
+# LD_LIBRARY_PATH passed to OpenOffice
+env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
+
+#
+# Mimetype Registry
+# It is used to select the handler that will be used in conversion.
+# Priority matters, first match take precedence on next lines.
+mimetype_registry =
+  application/pdf * ooo
+  video/* * ffmpeg
+  audio/* * ffmpeg
+  application/x-shockwave-flash * ffmpeg
+  application/ogg * ffmpeg
+  application/ogv * ffmpeg
+  image/* * ooo
+  text/* * ooo
+  application/zip * ooo
+  application/msword * ooo
+  application/vnd* * ooo
+  application/x-vnd* * ooo
+  application/postscript * ooo
+  application/wmf * ooo
+  application/csv * ooo
+  application/x-openoffice-gdimetafile * ooo
+  application/x-emf * ooo
+  application/emf * ooo
+  application/octet* * ooo
+  * application/vnd.oasis.opendocument* ooo
+
+[server:main]
+use = egg:PasteScript#wsgiutils
+host = %(ip)s
+port = %(port)s

software/cloudooo/instance.cfg

+[buildout]
+parts =
+  instance
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+
+# cloudooo specific configuration
+ooo_binary_path = ${libreoffice-bin:location}/program
+ooo_paster = ${buildout:bin-directory}/cloudooo_paster
+ooo_uno_path = ${libreoffice-bin:location}/basis-link/program
+
+link_binary_list =
+  ${xpdf:location}/bin/pdfinfo
+  ${xpdf:location}/bin/pdftotext
+  ${ffmpeg:location}/bin/ffmpeg
+  ${ffmpeg:location}/bin/ffprobe
+  ${imagemagick:location}/bin/convert
+  ${imagemagick:location}/bin/identify
+  ${pdftk:location}/bin/pdftk
+
+environment =
+  LD_LIBRARY_PATH = ${file:location}/lib:${zlib:location}/lib:${freetype:location}/lib:${libXext:location}/lib:${libXau:location}/lib:${libX11:location}/lib:${libXdmcp:location}/lib:${libxcb:location}/lib

software/cloudooo/software.cfg

+[buildout]
+extensions =
+  slapos.rebootstrap
+  slapos.tool.networkcache
+  slapos.zcbworkarounds
+  mr.developer
+
+find-links =
+    http://www.nexedi.org/static/packages/source/slapos.buildout/
+    http://dist.repoze.org
+    http://www.nexedi.org/static/packages/source/
+
+extends =
+  ../../stack/cloudooo.cfg
+
+versions = versions
+
+parts +=
+# Create instance template
+  template
+
+# XXX: Workaround of SlapOS limitation
+# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
+# development / fast switching environment for whole software
+unzip = true
+
+[instance-recipe]
+# Note: In case if specific instantiation recipe is used this is the place to
+# put its name
+egg = slapos.cookbook
+module = cloudooo
+
+[template]
+# Default template for erp5 instance.
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+md5sum = 45d8de2ca15f126506ad5c08357c5a26
+output = ${buildout:directory}/template.cfg
+mode = 0644

stack/cloudooo.cfg

+[buildout]
+extensions =
+  slapos.tool.rebootstrap
+  slapos.tool.networkcache
+  slapos.zcbworkarounds
+  mr.developer
+
+find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
+    http://dist.repoze.org
+    http://www.nexedi.org/static/packages/source/
+
+extends =
+  ../component/libreoffice-bin/buildout.cfg 
+  ../component/lxml-python/buildout.cfg
+  ../component/python-2.6/buildout.cfg
+  ../component/python-2.7/buildout.cfg
+  ../component/xorg/buildout.cfg
+  ../component/fonts/buildout.cfg
+  ../component/xpdf/buildout.cfg
+  ../component/imagemagick/buildout.cfg
+  ../component/pdftk/buildout.cfg
+  ../component/ffmpeg/buildout.cfg
+  ../component/file/buildout.cfg
+
+versions = versions
+
+parts =
+  libreoffice-bin
+
+# basic Xorg
+  libXdmcp
+  libXext
+  libXau
+  libX11
+
+# fonts
+  liberation-fonts
+  ipaex-fonts
+
+# Dependencies
+  imagemagick
+  file
+  xpdf 
+  pdftk
+  ffmpeg
+
+  instance-recipe-egg
+  bootstrap2.6
+  cloudooo
+
+[instance-recipe-egg]
+recipe = zc.recipe.egg
+python = python2.6
+eggs =
+  ${lxml-python:egg}
+# instantiation egg
+  ${instance-recipe:egg}
+
+[bootstrap2.6]
+python = python2.6
+
+[rebootstrap]
+# Default first version of rebootstrapped python
+version = 2
+section = python2.7
+
+[lxml-python]
+python = python2.6
+
+[cloudooo]
+recipe = zc.recipe.egg
+python = python2.6
+eggs =
+  ${lxml-python:egg}
+  cloudooo
+  PasteScript
+scripts =
+  paster=cloudooo_paster
+
+[versions]
+# Use SlapOS patched zc.buildout
+zc.buildout = 1.5.3-dev-SlapOS-001