SONAR-3045 Guess the property sonar.jdbc.driverClassName

1 files changed, 13 insertions, 7 deletions

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 560fab5c1a4..f3db4954445 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -44,9 +44,9 @@ sonar.jdbc.password:                       sonar
 # 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 following lines to deactivate the default embedded database.
+# Comment the following line 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.driverClassName:                org.apache.derby.jdbc.ClientDriver
 #sonar.jdbc.validationQuery:                values(1)
 
 # directory containing Derby database files. By default it's the /data directory in the sonar installation.
@@ -59,8 +59,10 @@ sonar.jdbc.driverClassName:                org.apache.derby.jdbc.ClientDriver
 
 
 #----- MySQL 5.x/6.x
-# Comment the embedded database and uncomment the following properties to use MySQL. The validation query is optional.
+# Comment the embedded database and uncomment the following line to use MySQL
 #sonar.jdbc.url:                            jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8
+
+# Optional properties
 #sonar.jdbc.driverClassName:                com.mysql.jdbc.Driver
 #sonar.jdbc.validationQuery:                select 1
 
@@ -71,9 +73,10 @@ sonar.jdbc.driverClassName:                org.apache.derby.jdbc.ClientDriver
 # - It's recommended to use the latest version of the JDBC driver (either ojdbc6.jar for Java 6 or ojdbc5.jar for Java 5).
 #   Download it in http://www.oracle.com/technetwork/database/enterprise-edition/jdbc-112010-090769.html
 # - Copy the driver to the directory extensions/jdbc-driver/oracle/
-# - Comment the embedded database and uncomment the following properties. The validation query is optional.
-#
+# - Comment the embedded database and uncomment the following line :
 #sonar.jdbc.url:                            jdbc:oracle:thin:@localhost/XE
+
+# Optional properties
 #sonar.jdbc.driverClassName:                oracle.jdbc.OracleDriver
 #sonar.jdbc.validationQuery:                select 1 from dual
 
@@ -84,8 +87,10 @@ sonar.jdbc.driverClassName:                org.apache.derby.jdbc.ClientDriver
 
 
 #----- PostgreSQL 8.x, 9.x
-# Uncomment the following properties to use PostgreSQL. The validation query is optional.
+# Comment the embedded database and uncomment the following property to use PostgreSQL
 #sonar.jdbc.url:                            jdbc:postgresql://localhost/sonar
+
+# Optional properties
 #sonar.jdbc.driverClassName:                org.postgresql.Driver
 #sonar.jdbc.validationQuery:                select 1
 
@@ -97,8 +102,9 @@ sonar.jdbc.driverClassName:                org.apache.derby.jdbc.ClientDriver
 
 #----- 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/sonar;SelectMethod=Cursor
+
+# Optional properties
 #sonar.jdbc.driverClassName:                net.sourceforge.jtds.jdbc.Driver
 #sonar.jdbc.validationQuery:                select 1