diff --git a/slapos/recipe/xwiki/__init__.py b/slapos/recipe/xwiki/__init__.py index 9215458bcfe6b89e02e4793ad9822e983ff80cf0..5f55423d78a69e38c42c7af950decb57887aabb6 100644 --- a/slapos/recipe/xwiki/__init__.py +++ b/slapos/recipe/xwiki/__init__.py @@ -57,8 +57,8 @@ class Recipe(BaseSlapRecipe): shtuil.rmtree(dst) raise - shutil.copy(self.options['hsql_location'].strip(), os.path.join(tomcat_lib, - 'hsqldb.jar')) + shutil.copy(self.options['jdbc_location'].strip(), os.path.join(tomcat_lib, + 'jdbc.jar')) # headless mode self._writeFile(os.path.join(tomcat_home, 'bin', 'setenv.sh'), '''#!/bin/sh export JAVA_OPTS="${JAVA_OPTS} -Djava.awt.headless=true" diff --git a/slapos/recipe/xwiki/template/hibernate.cfg.xml.in b/slapos/recipe/xwiki/template/hibernate.cfg.xml.in index 91196e74a928ca7c008ed82396aa8c074eb4586e..78d25f78bfa77b23b263ef21875e237470d5995b 100644 --- a/slapos/recipe/xwiki/template/hibernate.cfg.xml.in +++ b/slapos/recipe/xwiki/template/hibernate.cfg.xml.in @@ -49,7 +49,7 @@ Uncomment if you want to use MySQL and comment out other database configurations. We need to set the sql_mode to a less strict value, see XWIKI-1945 --> - <property name="connection.url">jdbc:mysql://%(mysql_ip)s:%(mysql_port)s/xwiki?useServerPrepStmts=false&useUnicode=true&characterEncoding=UTF-8&sessionVariables=sql_mode=''</property> + <property name="connection.url">jdbc:mysql://%(mysql_ip)s:%(mysql_port)s/xwiki?useServerPrepStmts=false&useUnicode=true&characterEncoding=UTF-8&sessionVariables=&sql_mode=''</property> <property name="connection.username">xwiki</property> <property name="connection.password">xwiki</property> <property name="connection.driver_class">com.mysql.jdbc.Driver</property> diff --git a/software/xwiki/software.cfg b/software/xwiki/software.cfg index 80e7d2d95b6262990d1342fe826bebea3bf30ff7..185bd9e9d8612ef41b071c4c7d4c9b7012903514 100644 --- a/software/xwiki/software.cfg +++ b/software/xwiki/software.cfg @@ -7,15 +7,6 @@ find-links = versions = versions -parts = - template - libxslt - eggs - instance-recipe-egg - tomcat - hsql - mysql-5.1 - [instance-recipe] egg = slapos.cookbook module = xwiki diff --git a/stack/tomcat.cfg b/stack/tomcat.cfg index f3a3232470fe7c1d944d7af470dcc25562010fdb..c2a795645c1c9fdfcc06cf5d2160d02a829047d0 100644 --- a/stack/tomcat.cfg +++ b/stack/tomcat.cfg @@ -29,6 +29,7 @@ parts = tomcat java hsql + jdbc mysql-5.1 [hsql]