Update xwiki SR

06cefb74 · Cédric de Saint Martin · 2d1dd00e · 06cefb74 · 06cefb74
Commit 06cefb74 authored Sep 10, 2012 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 24 deletions

software/xwiki/software.cfg software/xwiki/software.cfg +0 -6

stack/tomcat.cfg stack/tomcat.cfg +1 -18

No files found.
--- a/software/xwiki/software.cfg
+++ b/software/xwiki/software.cfg
@@ -2,18 +2,12 @@
 extends =
  ../../stack/tomcat.cfg
-find-links =
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-versions = versions
 [instance-recipe]
 egg = slapos.cookbook
 module = xwiki
 [instance-recipe-egg]
 recipe = zc.recipe.egg
-python = python2.7
 eggs = ${instance-recipe:egg}
 [template]

--- a/stack/tomcat.cfg
+++ b/stack/tomcat.cfg
@@ -3,24 +3,8 @@ extends =
  ../component/lxml-python/buildout.cfg
  ../component/java/buildout.cfg
  ../component/mysql-5.1/buildout.cfg
-  ../component/python-2.7/buildout.cfg
  ../component/tomcat/buildout.cfg
-  ../stack/shacache-client.cfg
+  ../stack/slapos.cfg
-find-links +=
-    http://www.nexedi.org/static/packages/source/slapos.buildout/
-# Use only quite well working sites.
-allow-hosts =
-  *.nexedi.org
-  *.python.org
-  *.sourceforge.net
-  dist.repoze.org
-  effbot.org
-  github.com
-  peak.telecommunity.com
-  psutil.googlecode.com
-  www.dabeaz.com
 parts =
  template
@@ -45,7 +29,6 @@ md5sum = 22e1aff6104bb9006f8744a02bf73124
 [eggs]
 recipe = zc.recipe.egg
-python = python2.7
 eggs =
  ${lxml-python:egg}
  slapos.cookbook