diff options
| author | simonbrandhof <simon.brandhof@gmail.com> | 2011-08-19 22:34:34 +0200 |
|---|---|---|
| committer | simonbrandhof <simon.brandhof@gmail.com> | 2011-08-19 22:34:58 +0200 |
| commit | 3a77746009765300042ef795ae77dc4cb3c0bcb0 (patch) | |
| tree | aa5bc0751698f8615d24ee8fe8fe844de18a11b0 /sonar-application | |
| parent | 12ebcddbcec1e865f271c1fc258ba52fd1c99ae9 (diff) | |
| download | sonarqube-3a77746009765300042ef795ae77dc4cb3c0bcb0.tar.gz sonarqube-3a77746009765300042ef795ae77dc4cb3c0bcb0.zip | |
SONAR-2587 and SONAR-2549 conflicts between database schemas
Diffstat (limited to 'sonar-application')
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 45a25935387..0947968e054 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -25,15 +25,14 @@ #sonar.ajp13.port: 8009 -#--------------------------------------------------------- +#----------------------------------------------------------------------- # DATABASE # # IMPORTANT : the embedded database Derby is used by default. -# It is recommended for tests only. Please use an other database -# for production environment (MySQL, Oracle, Postgresql, -# SQLServer) +# It is recommended for tests only. Please use an external database +# for production environment (MySQL, Oracle, Postgresql, SQLServer) # -#--------------------------------------------------------- +#----------------------------------------------------------------------- #----- Credentials # Permissions to create tables and indexes must be granted to JDBC user. @@ -82,6 +81,7 @@ sonar.jdbc.driverClassName: org.apache.derby.jdbc.ClientDriver #sonar.jdbc.url: jdbc:postgresql://localhost/sonar #sonar.jdbc.driverClassName: org.postgresql.Driver #sonar.jdbc.validationQuery: select 1 +#sonar.jdbc.postgreSearchPath: public #----- Microsoft SQLServer @@ -102,13 +102,13 @@ sonar.jdbc.timeBetweenEvictionRunsMillis: 30000 #----- JDBC Datasource bounded to JNDI -# When sonar webapp is deployed into a JEE server, the JDBC datasource can be configured into the JEE server and registered into JNDI. +# When sonar webapp is deployed into a JEE server, the JDBC datasource can be loaded from JNDI. # In such a case Sonar uses this datasource to connect to database. -# If you activate this feature, then the properties starting with "sonar.jdbc." can be commented, except "sonar.jdbc.dialect". +# If you activate this feature, then the properties starting with "sonar.jdbc." can be commented, except sonar.jdbc.dialect. # The JDBC driver must still be deployed into the directory /extensions/jdbc-driver. #sonar.jdbc.jndiName: jdbc/sonar -# Values are : mysql, mssql, derby, oracle, postgresql +# Values are : mysql, mssql, oracle, postgresql #sonar.jdbc.dialect= |