diff options
| author | Fabrice Bellingard <bellingard@gmail.com> | 2011-08-22 14:25:51 +0200 |
|---|---|---|
| committer | Fabrice Bellingard <bellingard@gmail.com> | 2011-08-22 14:25:51 +0200 |
| commit | 69c57fc4be9f4e552c69a6cdaeb5ee294eaabc62 (patch) | |
| tree | 11f4d90553c9551ed271a3424d10ca285e58a3c0 /sonar-application | |
| parent | 3a77746009765300042ef795ae77dc4cb3c0bcb0 (diff) | |
| download | sonarqube-69c57fc4be9f4e552c69a6cdaeb5ee294eaabc62.tar.gz sonarqube-69c57fc4be9f4e552c69a6cdaeb5ee294eaabc62.zip | |
Revert "SONAR-2587 and SONAR-2549 conflicts between database schemas"
Reason: support of PostgreSQL is broken.
This reverts commit 3a77746009765300042ef795ae77dc4cb3c0bcb0.
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 0947968e054..45a25935387 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -25,14 +25,15 @@ #sonar.ajp13.port: 8009 -#----------------------------------------------------------------------- +#--------------------------------------------------------- # DATABASE # # IMPORTANT : the embedded database Derby is used by default. -# It is recommended for tests only. Please use an external database -# for production environment (MySQL, Oracle, Postgresql, SQLServer) +# It is recommended for tests only. Please use an other database +# for production environment (MySQL, Oracle, Postgresql, +# SQLServer) # -#----------------------------------------------------------------------- +#--------------------------------------------------------- #----- Credentials # Permissions to create tables and indexes must be granted to JDBC user. @@ -81,7 +82,6 @@ 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 loaded from JNDI. +# When sonar webapp is deployed into a JEE server, the JDBC datasource can be configured into the JEE server and registered into 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, oracle, postgresql +# Values are : mysql, mssql, derby, oracle, postgresql #sonar.jdbc.dialect= |