Fixing the standalone.conf.bat file update (JVM_OPTS config parameter).

Modifying the datasource deployment to add a parameter to JDBC URL connection for SQL Server (;sendStringParametersAsUnicode=false). It improves significantly the performances on calendar management.

Author: SilverYoCha

src/main/groovy/org/silverpeas/setup/SilverpeasSetupPlugin.groovy

@@ -295,8 +295,8 @@ class SilverpeasSetupPlugin implements Plugin<Project> {
     settings.DB_DATASOURCE_JNDI = 'java:/datasources/silverpeas'
     switch (settings.DB_SERVERTYPE) {
       case 'MSSQL':
-        settings.DB_URL = "jdbc:jtds:sqlserver://${settings.DB_SERVER}:${settings.DB_PORT_MSSQL}/${settings.DB_NAME}"
-        settings.JCR_URL = "jdbc:jtds:sqlserver://${settings.DB_SERVER}:${settings.DB_PORT_MSSQL}/${settings.JCR_NAME}"
+        settings.DB_URL = "jdbc:jtds:sqlserver://${settings.DB_SERVER}:${settings.DB_PORT_MSSQL}/${settings.DB_NAME};sendStringParametersAsUnicode=false"
+        settings.JCR_URL = "jdbc:jtds:sqlserver://${settings.DB_SERVER}:${settings.DB_PORT_MSSQL}/${settings.JCR_NAME};sendStringParametersAsUnicode=false"
         settings.DB_DRIVER = 'net.sourceforge.jtds.jdbc.Driver'
         settings.JACKRABBIT_PERSISTENCE_MANAGER = 'org.apache.jackrabbit.core.persistence.pool.MSSqlPersistenceManager'
         break

src/main/groovy/org/silverpeas/setup/configuration/JBossConfigurationTask.groovy

@@ -116,7 +116,7 @@ class JBossConfigurationTask extends SilverpeasSetupTask {
       jvmSize = "    set \"JBOSS_JAVA_SIZING=-Xmx${settings.JVM_RAM_MAX}\""
       jvmOpts = "set \"JAVA_OPTS=%JBOSS_JAVA_SIZING%${optsToSet}\""
       regexpSize = /\s*set\s+"JBOSS_JAVA_SIZING=-Xm.+/
-      regexpOpts = /\s*set\s+"JAVA_OPTS=%JBOSS_JAVA_SIZING%"/
+      regexpOpts = /\s*set\s+"JAVA_OPTS=%JBOSS_JAVA_SIZING%.+/
     } else {
       jvmSize = "   JBOSS_JAVA_SIZING=\"-Xmx${settings.JVM_RAM_MAX}\""
       jvmOpts = "   JAVA_OPTS=\"\$JBOSS_JAVA_SIZING -Djava.net.preferIPv4Stack=true${optsToSet}\""