Update xwiki to work with 'modern' slapos. Create Tomcat stack.

component/java/buildout.cfg

+[buildout]
+parts =
+  java
+
+versions = versions
+
+[java]
+recipe = slapos.cookbook:java

software/xwiki/instance.cfg

 [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
 

software/xwiki/software.cfg

 [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

stack/xwiki.cfg → stack/tomcat.cfg

 [buildout]
 extends =
   ../component/lxml-python/buildout.cfg
+  ../component/java/buildout.cfg
   ../component/mysql-5.1/buildout.cfg
 
 parts =
+  templates
   tomcat
   java
-  xwiki
   hsql
   mysql-5.1
   eggs
@@ -22,23 +23,6 @@ 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 =