SONAR-2359 Most of properties sonar.jdbc.* should not be required when JDBC datasource is loaded from JNDI

1 files changed, 19 insertions, 15 deletions

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index aca69ce9dbe..23823ae59ec 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -35,14 +35,21 @@
 #
 #---------------------------------------------------------
 
+#----- Credentials
+# Permissions to create tables and indexes must be granted to JDBC user.
+# The schema must be created first.
+sonar.jdbc.username:                       sonar
+sonar.jdbc.password:                       sonar
+
 #----- Embedded database Derby
 # Note : it does accept connections from remote hosts, so the
 # sonar server and the maven plugin must be executed on the same host.
   
-# Comment the 3 following lines to deactivate the default embedded database
+# Comment the following lines to deactivate the default embedded database.
 sonar.jdbc.url:                            jdbc:derby://localhost:1527/sonar;create=true
 sonar.jdbc.driverClassName:                org.apache.derby.jdbc.ClientDriver
-sonar.jdbc.validationQuery:                values(1)
+#sonar.jdbc.validationQuery:                values(1)
+
 # directory containing Derby database files. By default it's the /data directory in the sonar installation.
 #sonar.embeddedDatabase.dataDir:
 # derby embedded database server listening port, defaults to 1527
@@ -52,14 +59,14 @@ sonar.jdbc.validationQuery:                values(1)
 #sonar.derby.drda.host: 0.0.0.0
 
 #----- MySQL 5.x/6.x
-# Comment the embedded database and uncomment the following lines to use MySQL
+# Comment the embedded database and uncomment the following properties to use MySQL. The validation query is optional.
 #sonar.jdbc.url:                            jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8
 #sonar.jdbc.driverClassName:                com.mysql.jdbc.Driver
 #sonar.jdbc.validationQuery:                select 1
 
 
 #----- Oracle 10g/11g
-# Comment the embedded database and uncomment the following lines to use Oracle
+# Comment the embedded database and uncomment the following properties to use Oracle. The validation query is optional.
 #sonar.jdbc.url:                            jdbc:oracle:thin:@localhost/XE
 #sonar.jdbc.driverClassName:                oracle.jdbc.driver.OracleDriver
 #sonar.jdbc.validationQuery:                select 1 from dual
@@ -69,7 +76,7 @@ sonar.jdbc.validationQuery:                values(1)
 #sonar.hibernate.default_schema:            sonar
 
 #----- PostgreSQL 8.x, 9.x
-# uncomment the 3 following lines to use PostgreSQL
+# Uncomment the following properties to use PostgreSQL. The validation query is optional.
 #sonar.jdbc.url:                            jdbc:postgresql://localhost/sonar
 #sonar.jdbc.driverClassName:                org.postgresql.Driver
 #sonar.jdbc.validationQuery:                select 1
@@ -77,14 +84,13 @@ sonar.jdbc.validationQuery:                values(1)
 
 #----- Microsoft SQLServer
 # The Jtds open source driver is available in extensions/jdbc-driver/mssql. More details on http://jtds.sourceforge.net
+# The validation query is optional.
 #sonar.jdbc.url:                            jdbc:jtds:sqlserver://localhost;databaseName=SONAR;SelectMethod=Cursor
 #sonar.jdbc.driverClassName:                net.sourceforge.jtds.jdbc.Driver
 #sonar.jdbc.validationQuery:                select 1  
 
 
-#----- Global database settings
-sonar.jdbc.username:                       sonar
-sonar.jdbc.password:                       sonar
+#----- Connection pool settings
 sonar.jdbc.maxActive:                      10
 sonar.jdbc.maxIdle:                        5
 sonar.jdbc.minIdle:                        2
@@ -92,14 +98,12 @@ sonar.jdbc.maxWait:                        5000
 sonar.jdbc.minEvictableIdleTimeMillis:     600000
 sonar.jdbc.timeBetweenEvictionRunsMillis:  30000
 
-# Transaction isolation level. Default driver setting is used by default.
-# Values : 1 (TRANSACTION_READ_UNCOMMITED), 2 (TRANSACTION_READ_COMMITTED), 4 (TRANSACTION_REPEATABLE_READ), 8 (TRANSACTION_SERIALIZABLE)
-#sonar.jdbc.defaultTransactionIsolation: 2
-
 
-# When packaged in a WAR, JDBC datasource can be configured into the application server then registered to JNDI.
-# In such a case Sonar uses this datasource to connect to database, else if binds itself its own datasource.
-# Note : Jonas does not accept to bind subcontexts, so name should be something like 'jdbc-sonar', without slashes.
+#----- 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.
+# 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.driverClassName".
+# The JDBC driver must still be deployed into the directory /extensions/jdbc-driver.
 #sonar.jdbc.jndiName:                       jdbc/sonar
 
 # If you don't use the default JDBC drivers, as listed above, then you have to explicitly set the dialect to use.