Merge branch Release-2.112.11

1 files changed, 17 insertions, 21 deletions

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 45a25935387..dc05f1625ff 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.
@@ -66,15 +65,20 @@ sonar.jdbc.driverClassName:                org.apache.derby.jdbc.ClientDriver
 
 
 #----- Oracle 10g/11g
-# To use Oracle database :
-# - Copy the JDBC driver to extensions/jdbc-driver/oracle.
+# To connect to Oracle database :
+#
+# - 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.
+#
 #sonar.jdbc.url:                            jdbc:oracle:thin:@localhost/XE
 #sonar.jdbc.driverClassName:                oracle.jdbc.driver.OracleDriver
 #sonar.jdbc.validationQuery:                select 1 from dual
 
-# Activate if more than one Sonar Oracle schemas on the data server (for example different versions installed).
-# In that case, use the same property during maven analysis (-Dsonar.hibernate.default_schema=xxx)
+# Uncomment the following property if multiple Sonar schemas are installed on the same server 
+# (for example with different versions).
+# In that case, use the same property during project analysis (-Dsonar.hibernate.default_schema=<schema>)
 #sonar.hibernate.default_schema:            sonar
 
 #----- PostgreSQL 8.x, 9.x
@@ -83,6 +87,9 @@ sonar.jdbc.driverClassName:                org.apache.derby.jdbc.ClientDriver
 #sonar.jdbc.driverClassName:                org.postgresql.Driver
 #sonar.jdbc.validationQuery:                select 1
 
+# If the PostgreSql database contains several schemas, the following property must define the schema to be used
+#sonar.jdbc.postgreSearchPath:              public
+
 
 #----- Microsoft SQLServer
 # The Jtds open source driver is available in extensions/jdbc-driver/mssql. More details on http://jtds.sourceforge.net
@@ -93,7 +100,7 @@ sonar.jdbc.driverClassName:                org.apache.derby.jdbc.ClientDriver
 
 
 #----- Connection pool settings
-sonar.jdbc.maxActive:                      10
+sonar.jdbc.maxActive:                      20
 sonar.jdbc.maxIdle:                        5
 sonar.jdbc.minIdle:                        2
 sonar.jdbc.maxWait:                        5000
@@ -101,17 +108,6 @@ sonar.jdbc.minEvictableIdleTimeMillis:     600000
 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.
-# 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".
-# 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
-#sonar.jdbc.dialect=
-
-
 #---------------------------------------------------------
 # UPDATE CENTER
 #---------------------------------------------------------