From 116b1b9aed72481fbcdf4eeda7804950b9883fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Wed, 24 Aug 2011 16:17:12 +0200
Subject: [PATCH] Update xwiki to work with 'modern' slapos. Create Tomcat
 stack.

---
 component/java/buildout.cfg |  8 +++++++
 software/xwiki/instance.cfg | 25 +++++++++----------
 software/xwiki/software.cfg | 35 ++++++++++++++++++++-------
 stack/tomcat.cfg            | 32 +++++++++++++++++++++++++
 stack/xwiki.cfg             | 48 -------------------------------------
 5 files changed, 79 insertions(+), 69 deletions(-)
 create mode 100644 component/java/buildout.cfg
 create mode 100644 stack/tomcat.cfg
 delete mode 100644 stack/xwiki.cfg

diff --git a/component/java/buildout.cfg b/component/java/buildout.cfg
new file mode 100644
index 000000000..e0f9ccf7d
--- /dev/null
+++ b/component/java/buildout.cfg
@@ -0,0 +1,8 @@
+[buildout]
+parts =
+  java
+
+versions = versions
+
+[java]
+recipe = slapos.cookbook:java
diff --git a/software/xwiki/instance.cfg b/software/xwiki/instance.cfg
index 08b31774d..b03e15a5f 100644
--- a/software/xwiki/instance.cfg
+++ b/software/xwiki/instance.cfg
@@ -1,15 +1,16 @@
 [buildout]
-parts =
-  xwiki
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
 
-[xwiki]
-<=slap_connection
-recipe = slapos.cookbook:xwiki
-hsql_location = ${software_definition:software_home}/parts/hsql/hsqldb.jar
-tomcat_location = ${software_definition:software_home}/parts/tomcat
-xwiki_location = ${software_definition:software_home}/parts/xwiki
-java_home = ${software_definition:software_home}/parts/java/jre1.6.0_23
-mysqld_binary = ${software_definition:software_home}/parts/mysql-5.1/libexec/mysqld
-mysql_binary = ${software_definition:software_home}/parts/mysql-5.1/bin/mysql
-mysql_install_binary = ${software_definition:software_home}/parts/mysql-5.1/bin/mysql_install_db
+parts = instance
+
+[instance]
+recipe = ${instance-recipe:egg}:${instance-recipe:module}
+hsql_location = ${hsql:location}/hsqldb.jar
+tomcat_location = ${tomcat:location}
+xwiki_location = ${xwiki:location}
+java_home = ${java:location}
+mysqld_binary = ${mysql:location}/libexec/mysqld
+mysql_binary = ${mysql:location}/bin/mysql
+mysql_install_binary = ${mysql:location}/bin/mysql_install_db
 
diff --git a/software/xwiki/software.cfg b/software/xwiki/software.cfg
index 63903d2fb..07f601d52 100644
--- a/software/xwiki/software.cfg
+++ b/software/xwiki/software.cfg
@@ -1,9 +1,6 @@
 [buildout]
 extends =
-  ../../stack/xwiki.cfg
-
-parts +=
-  template
+  ../../stack/tomcat.cfg
 
 find-links =
     http://www.nexedi.org/static/packages/source/slapos.buildout/
@@ -11,12 +8,32 @@ find-links =
 versions = versions
 
 [template]
-recipe = slapos.cookbook:download
+# Default template for the instance.
+recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 88fe7e2d1e04618b1b4fcafde683d75a
-destination = ${buildout:directory}/template.cfg
+#md5sum = 88fe7e2d1e04618b1b4fcafde683d75a
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[xwiki]
+recipe = hexagonit.recipe.download
+url = http://download.forge.objectweb.org/xwiki/xwiki-enterprise-web-2.7.war
+md5sum = c56e2cde96d28c5899a16a8270b6ff88
 
 [versions]
+#slapos.cookbook = 0.17
+#
+## Required by slapos.cookbook==0.17
+#slapos.core = 0.12
+slapos.libnetworkcache = 0.2
+#collective.recipe.template = 1.8
+#netaddr = 0.7.5
+#xml-marshaller = 0.9.7
+#setuptools = 0.6c12dev-r88846
+#
+#hexagonit.recipe.cmmi = 1.5.0
+#hexagonit.recipe.download = 1.5.0
+#plone.recipe.command = 1.1
+#
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-001
-
+zc.buildout = 1.5.3-dev-SlapOS-005
diff --git a/stack/tomcat.cfg b/stack/tomcat.cfg
new file mode 100644
index 000000000..8318c9b74
--- /dev/null
+++ b/stack/tomcat.cfg
@@ -0,0 +1,32 @@
+[buildout]
+extends =
+  ../component/lxml-python/buildout.cfg
+  ../component/java/buildout.cfg
+  ../component/mysql-5.1/buildout.cfg
+
+parts =
+  templates
+  tomcat
+  java
+  hsql
+  mysql-5.1
+  eggs
+
+[hsql]
+recipe = hexagonit.recipe.download
+url = http://hsqldb.org/support/hsqldb_16.zip
+md5sum = 5e5f08e1c838e97efa359cdfc301cc06
+
+[tomcat]
+recipe = hexagonit.recipe.download
+strip-top-level-dir = true
+url = http://apache.multidist.com/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.zip
+md5sum = 082a0707985b6c029920d4d6d5ec11cd
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  slapos.cookbook
+
+
diff --git a/stack/xwiki.cfg b/stack/xwiki.cfg
deleted file mode 100644
index 806d3f550..000000000
--- a/stack/xwiki.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-[buildout]
-extends =
-  ../component/lxml-python/buildout.cfg
-  ../component/mysql-5.1/buildout.cfg
-
-parts =
-  tomcat
-  java
-  xwiki
-  hsql
-  mysql-5.1
-  eggs
-
-[hsql]
-recipe = hexagonit.recipe.download
-url = http://hsqldb.org/support/hsqldb_16.zip
-md5sum = 5e5f08e1c838e97efa359cdfc301cc06
-
-[tomcat]
-recipe = hexagonit.recipe.download
-strip-top-level-dir = true
-url = http://apache.multidist.com/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.zip
-md5sum = 082a0707985b6c029920d4d6d5ec11cd
-
-[xwiki]
-recipe = hexagonit.recipe.download
-url = http://download.forge.objectweb.org/xwiki/xwiki-enterprise-web-2.7.war
-md5sum = c56e2cde96d28c5899a16a8270b6ff88
-
-[java-download]
-recipe = slapos.cookbook:download
-# 64bit self extracting
-url = http://javadl.sun.com/webapps/download/AutoDL?BundleId=43875
-md5sum = e4143387e31838a51df76774d102f49a
-
-[java]
-recipe = plone.recipe.command
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-command = rm -fr ${:location} && mkdir -p ${:location} && cd ${:location} && /bin/sh ${java-download:target}
-update-command = ${:command}
-
-[eggs]
-recipe = zc.recipe.egg
-eggs =
-  ${lxml-python:egg}
-  slapos.cookbook
-
-
-- 
2.30.9