Merge branch 'xwiki'

3092f8fa · Cédric de Saint Martin · 4c1db4d5 · fef5e8f7 · 3092f8fa · 3092f8fa
Commit 3092f8fa authored Aug 27, 2011 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

software/xwiki/instance.cfg software/xwiki/instance.cfg +1 -1

software/xwiki/software.cfg software/xwiki/software.cfg +1 -1

No files found.
--- a/software/xwiki/instance.cfg
+++ b/software/xwiki/instance.cfg
@@ -6,7 +6,7 @@ parts = instance

 [instance]
 recipe = ${instance-recipe:egg}:${instance-recipe:module}
-hsql_location = ${hsql:location}/hsqldb.jar
+jdbc_location = ${jdbc:location}/mysql-connector-java-5.1.17/mysql-connector-java-5.1.17-bin.jar
 tomcat_location = ${tomcat:location}
 xwiki_location = ${xwiki:location}
 java_home = ${java:location}

--- a/software/xwiki/software.cfg
+++ b/software/xwiki/software.cfg
@@ -20,7 +20,7 @@ eggs = ${instance-recipe:egg}
 # Default template for the instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = fdf7f3130f8c3ab804dccf163eb92d90
+md5sum = dbdc297502f0258c85fe7dfbddc8e501
 output = ${buildout:directory}/template.cfg
 mode = 0644